Renamed AppMenuBadgeController to AppMenuIconController

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

 // 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.
 
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 111 matching lines @@
 
 ToolbarView::ToolbarView(Browser* browser)
     : back_(nullptr),
       forward_(nullptr),
       reload_(nullptr),
       home_(nullptr),
       location_bar_(nullptr),
       browser_actions_(nullptr),
       app_menu_button_(nullptr),
       browser_(browser),
-      badge_controller_(browser->profile(), this),
+      icon_controller_(browser->profile(), this),
       display_mode_(browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)
                         ? DISPLAYMODE_NORMAL
                         : DISPLAYMODE_LOCATION) {
   set_id(VIEW_ID_TOOLBAR);
 
   SetEventTargeter(
       std::unique_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 
   chrome::AddCommandObserver(browser_, IDC_BACK, this);
   chrome::AddCommandObserver(browser_, IDC_FORWARD, this);
@@ skipping 89 matching lines @@
   AddChildView(back_);
   AddChildView(forward_);
   AddChildView(reload_);
   AddChildView(home_);
   AddChildView(location_bar_);
   AddChildView(browser_actions_);
   AddChildView(app_menu_button_);
 
   LoadImages();
 
-  // Start global error services now so we badge the menu correctly.
+  // Start global error services now so we set the icon on the menu correctly.
 #if !defined(OS_CHROMEOS)
   if (!HasAshShell()) {
     SigninGlobalErrorFactory::GetForProfile(browser_->profile());
 #if !defined(OS_ANDROID)
     SyncGlobalErrorFactory::GetForProfile(browser_->profile());
 #endif
   }
 
 #if defined(OS_WIN)
   RecoveryInstallGlobalErrorFactory::GetForProfile(browser_->profile());
 #endif
 #endif  // OS_CHROMEOS
 
-  // Add any necessary badges to the menu item based on the system state.
-  // Do this after |app_menu_button_| has been added as a bubble may be shown
-  // that needs the widget (widget found by way of app_menu_button_->
-  // GetWidget()).
-  badge_controller_.UpdateDelegate();
+  // Set the button icon based on the system state. Do this after
+  // |app_menu_button_| has been added as a bubble may be shown that needs
+  // the widget (widget found by way of app_menu_button_->GetWidget()).
+  icon_controller_.UpdateDelegate();
 
   location_bar_->Init();
 
   show_home_button_.Init(prefs::kShowHomeButton,
                          browser_->profile()->GetPrefs(),
                          base::Bind(&ToolbarView::OnShowHomeButtonChanged,
                                     base::Unretained(this)));
 
   // Accessibility specific tooltip text.
   if (content::BrowserAccessibilityState::GetInstance()->
@@ skipping 368 matching lines @@
 
   // Fall through to the tab strip above us if none of |rect| intersects
   // with this view (intersection with the top shadow edge does not
   // count as intersection with this view).
   if (rect.bottom() < content_shadow_height())
     return false;
   // Otherwise let our superclass take care of it.
   return ViewTargeterDelegate::DoesIntersectRect(this, rect);
 }
 
-void ToolbarView::UpdateBadgeSeverity(AppMenuBadgeController::BadgeType type,
-                                      AppMenuIconPainter::Severity severity,
-                                      bool animate) {
+void ToolbarView::UpdateIconSeverity(AppMenuIconController::IconType type,

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

nit: would be easier to grok if you copied the pattern of DoesIntersectRect
(stating what interface this is for)

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

Could you be a little more specific about what you mean? There is already a
comment on the declaration for the delegate's method.

[Evan Stade, 2016/06/10 19:38:58]

it seems you figured it out :)

+                                     AppMenuIconPainter::Severity severity,
+                                     bool animate) {
   // There's no app menu in tabless windows.
   if (!app_menu_button_)
     return;
 
   // Showing the bubble requires |app_menu_button_| to be in a widget. See
   // comment in ConflictingModuleView for details.
   DCHECK(app_menu_button_->GetWidget());
 
   base::string16 accname_app = l10n_util::GetStringUTF16(IDS_ACCNAME_APP);
-  if (type == AppMenuBadgeController::BadgeType::UPGRADE_NOTIFICATION) {
+  if (type == AppMenuIconController::IconType::UPGRADE_NOTIFICATION) {
     accname_app = l10n_util::GetStringFUTF16(
         IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);
   }
   app_menu_button_->SetAccessibleName(accname_app);
   app_menu_button_->SetSeverity(type, severity, animate);
 
-  // Keep track of whether we were showing the badge before, so we don't send
-  // multiple UMA events for example when multiple Chrome windows are open.
-  static bool incompatibility_badge_showing = false;
+  // Keep track of whether we were showing the incompatibility icon before,
+  // so we don't send multiple UMA events for example when multiple Chrome
+  // windows are open.
+  static bool incompatibility_icon_showing = false;
   // Save the old value before resetting it.
-  bool was_showing = incompatibility_badge_showing;
-  incompatibility_badge_showing = false;
+  bool was_showing = incompatibility_icon_showing;
+  incompatibility_icon_showing = false;
 
-  if (type == AppMenuBadgeController::BadgeType::INCOMPATIBILITY_WARNING) {
+  if (type == AppMenuIconController::IconType::INCOMPATIBILITY_WARNING) {
     if (!was_showing) {
       content::RecordAction(UserMetricsAction("ConflictBadge"));
 #if defined(OS_WIN)
       ConflictingModuleView::MaybeShow(browser_, app_menu_button_);
 #endif
     }
-    incompatibility_badge_showing = true;
+    incompatibility_icon_showing = true;

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

I would call this the more generic/logical "incompatibility_warning_showing"

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

Done.

     return;
   }
 }
 
 gfx::Size ToolbarView::GetSizeInternal(
     gfx::Size (View::*get_size)() const) const {
   gfx::Size size((location_bar_->*get_size)());
   if (is_display_mode_normal()) {
     const int element_padding = GetLayoutConstant(TOOLBAR_ELEMENT_PADDING);
     const int browser_actions_width =
@@ skipping 103 matching lines @@
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
 #if defined(USE_ASH)
   return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH);
 #else
   return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT);
 #endif
 }