Renamed AppMenuBadgeController to AppMenuIconController

chrome/browser/ui/views/toolbar/toolbar_view.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "chrome/browser/command_observer.h"
-#include "chrome/browser/ui/toolbar/app_menu_badge_controller.h"
+#include "chrome/browser/ui/toolbar/app_menu_icon_controller.h"
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "components/prefs/pref_member.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/view.h"
 
 class AppMenuButton;
@@ skipping 11 matching lines @@
 
 // The Browser Window's toolbar.
 class ToolbarView : public views::AccessiblePaneView,
                     public views::MenuButtonListener,
                     public ui::AcceleratorProvider,
                     public LocationBarView::Delegate,
                     public content::NotificationObserver,
                     public CommandObserver,
                     public views::ButtonListener,
                     public views::ViewTargeterDelegate,
-                    public AppMenuBadgeController::Delegate {
+                    public AppMenuIconController::Delegate {
  public:
   // The view class name.
   static const char kViewClassName[];
 
   explicit ToolbarView(Browser* browser);
   ~ToolbarView() override;
 
   // Create the contents of the Browser Toolbar.
   void Init();
 
@@ skipping 33 matching lines @@
   // Returns the maximum width the browser actions container can have.
   int GetMaxBrowserActionsWidth() const;
 
   // Accessors.
   Browser* browser() const { return browser_; }
   BrowserActionsContainer* browser_actions() const { return browser_actions_; }
   ReloadButton* reload_button() const { return reload_; }
   LocationBarView* location_bar() const { return location_bar_; }
   AppMenuButton* app_menu_button() const { return app_menu_button_; }
   HomeButton* home_button() const { return home_; }
-  AppMenuBadgeController* app_menu_badge_controller() {
-    return &badge_controller_;
+  AppMenuIconController* app_menu_icon_controller() {
+    return &icon_controller_;
   }
 
   // AccessiblePaneView:
   bool SetPaneFocus(View* initial_focus) override;
   void GetAccessibleState(ui::AXViewState* state) override;
 
   // views::MenuButtonListener:
   void OnMenuButtonClicked(views::MenuButton* source,
                            const gfx::Point& point,
                            const ui::Event* event) override;
@@ skipping 46 matching lines @@
   enum DisplayMode {
     DISPLAYMODE_NORMAL,       // Normal toolbar with buttons, etc.
     DISPLAYMODE_LOCATION      // Slimline toolbar showing only compact location
                               // bar, used for popups.
   };
 
   // views::ViewTargeterDelegate:
   bool DoesIntersectRect(const views::View* target,
                          const gfx::Rect& rect) const override;
 
-  // AppMenuBadgeController::Delegate:
-  void UpdateBadgeSeverity(AppMenuBadgeController::BadgeType type,
-                           AppMenuIconPainter::Severity severity,
-                           bool animate) override;
+  // AppMenuIconController::Delegate:
+  void UpdateIconSeverity(AppMenuIconController::IconType type,

[Evan Stade, 2016/06/10 18:01:57]

in cases like this I would go ahead and remove the "badge" and just leave it at
UpdateSeverity, which is generic enough to apply to multiple possible UI
treatments. (Or you can call it something like UpdateSeverityIndication)

[kylix_rd, 2016/06/10 19:08:53]

Done.

+                          AppMenuIconPainter::Severity severity,
+                          bool animate) override;
 
   // Used to avoid duplicating the near-identical logic of
   // ToolbarView::GetPreferredSize() and ToolbarView::GetMinimumSize(). These
   // two functions call through to GetSizeInternal(), passing themselves as the
   // function pointer |View::*get_size|.
   gfx::Size GetSizeInternal(gfx::Size (View::*get_size)() const) const;
 
   // Given toolbar contents of size |size|, returns the total toolbar size.
   gfx::Size SizeForContentSize(gfx::Size size) const;
 
@@ skipping 20 matching lines @@
   BackButton* back_;
   ToolbarButton* forward_;
   ReloadButton* reload_;
   HomeButton* home_;
   LocationBarView* location_bar_;
   BrowserActionsContainer* browser_actions_;
   AppMenuButton* app_menu_button_;
 
   Browser* browser_;
 
-  AppMenuBadgeController badge_controller_;
+  AppMenuIconController icon_controller_;

[Evan Stade, 2016/06/10 18:01:57]

can you rename to app_menu_icon_controller_? In the context of the toolbar view,
there are many icons.

[kylix_rd, 2016/06/10 19:08:53]

Done.

 
   // Controls whether or not a home button should be shown on the toolbar.
   BooleanPrefMember show_home_button_;
 
   // The display mode used when laying out the toolbar.
   const DisplayMode display_mode_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_