Create a cross-platform helper class for badging the wrench menu.

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/debug/trace_event.h"
 #include "base/i18n/number_formatting.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
@@ skipping 20 matching lines @@
 #include "chrome/browser/ui/views/location_bar/star_view.h"
 #include "chrome/browser/ui/views/location_bar/translate_icon_view.h"
 #include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h"
 #include "chrome/browser/ui/views/toolbar/back_button.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "chrome/browser/ui/views/toolbar/home_button.h"
 #include "chrome/browser/ui/views/toolbar/reload_button.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
 #include "chrome/browser/ui/views/toolbar/wrench_menu.h"
 #include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h"
-#include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/views/controls/menu/menu_listener.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/view_targeter.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#include "chrome/browser/enumerate_modules_model_win.h"
 #include "chrome/browser/ui/views/conflicting_module_view_win.h"
 #include "chrome/browser/ui/views/critical_notification_bubble_view.h"
 #endif
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/signin/signin_global_error_factory.h"
 #include "chrome/browser/sync/sync_global_error_factory.h"
 #endif
 
 #if defined(USE_ASH)
@@ skipping 41 matching lines @@
 
 ToolbarView::ToolbarView(Browser* browser)
     : back_(NULL),
       forward_(NULL),
       reload_(NULL),
       home_(NULL),
       location_bar_(NULL),
       browser_actions_(NULL),
       app_menu_(NULL),
       browser_(browser),
+      badge_controller_(browser->profile(), this),
       extension_message_bubble_factory_(
           new extensions::ExtensionMessageBubbleFactory(browser->profile(),
                                                         this)) {
   set_id(VIEW_ID_TOOLBAR);
 
   SetEventTargeter(
       scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 
   chrome::AddCommandObserver(browser_, IDC_BACK, this);
   chrome::AddCommandObserver(browser_, IDC_FORWARD, this);
@@ skipping 10 matching lines @@
                  content::NotificationService::AllSources());
   if (OutdatedUpgradeBubbleView::IsAvailable()) {
     registrar_.Add(this, chrome::NOTIFICATION_OUTDATED_INSTALL,
                    content::NotificationService::AllSources());
     registrar_.Add(this, chrome::NOTIFICATION_OUTDATED_INSTALL_NO_AU,
                    content::NotificationService::AllSources());
   }
 #if defined(OS_WIN)
   registrar_.Add(this, chrome::NOTIFICATION_CRITICAL_UPGRADE_INSTALLED,
                  content::NotificationService::AllSources());
-  if (base::win::GetVersion() == base::win::VERSION_XP) {
-    registrar_.Add(this, chrome::NOTIFICATION_MODULE_LIST_ENUMERATED,
-                   content::NotificationService::AllSources());
-  }
 #endif
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_BADGE_CHANGE,
-                 content::NotificationService::AllSources());
-  registrar_.Add(this, chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED,
-                 content::Source<Profile>(browser_->profile()));
 }
 
 ToolbarView::~ToolbarView() {
   // NOTE: Don't remove the command observers here.  This object gets destroyed
   // after the Browser (which owns the CommandUpdater), so the CommandUpdater is
   // already gone.
 }
 
 void ToolbarView::Init() {
   GetWidget()->AddObserver(this);
@@ skipping 68 matching lines @@
     SigninGlobalErrorFactory::GetForProfile(browser_->profile());
 #if !defined(OS_ANDROID)
     SyncGlobalErrorFactory::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_| has been added as a bubble may be shown that
   // needs the widget (widget found by way of app_menu_->GetWidget()).
-  UpdateAppMenuState();
+  badge_controller_.UpdateDelegate();
 
   location_bar_->Init();
 
   show_home_button_.Init(prefs::kShowHomeButton,
                          browser_->profile()->GetPrefs(),
                          base::Bind(&ToolbarView::OnShowHomeButtonChanged,
                                     base::Unretained(this)));
 
   browser_actions_->Init();
 
@@ skipping 205 matching lines @@
       browser_, sender->tag(), ui::DispositionFromEventFlags(event.flags()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, content::NotificationObserver implementation:
 
 void ToolbarView::Observe(int type,
                           const content::NotificationSource& source,
                           const content::NotificationDetails& details) {
   switch (type) {
-    case chrome::NOTIFICATION_UPGRADE_RECOMMENDED:
-    case chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_BADGE_CHANGE:
-    case chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED:
-    case chrome::NOTIFICATION_MODULE_LIST_ENUMERATED:
-      UpdateAppMenuState();
-      break;
     case chrome::NOTIFICATION_OUTDATED_INSTALL:
       ShowOutdatedInstallNotification(true);
       break;
     case chrome::NOTIFICATION_OUTDATED_INSTALL_NO_AU:
       ShowOutdatedInstallNotification(false);
       break;
 #if defined(OS_WIN)
     case chrome::NOTIFICATION_CRITICAL_UPGRADE_INSTALLED:
       ShowCriticalNotification();
       break;
@@ skipping 198 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);
 }
 
-bool ToolbarView::ShouldShowUpgradeRecommended() {
-#if defined(OS_CHROMEOS)
-  // In chromeos, the update recommendation is shown in the system tray. So it
-  // should not be displayed in the wrench menu.
-  return false;
-#else
-  return (UpgradeDetector::GetInstance()->notify_upgrade());
+void ToolbarView::UpdateBadgeSeverity(WrenchMenuBadgeController::BadgeType type,
+                                      WrenchIconPainter::Severity severity,
+                                      bool animate)  {
+  // Showing the bubble requires |app_menu_| to be in a widget. See comment
+  // in ConflictingModuleView for details.
+  DCHECK(app_menu_->GetWidget());
+
+  base::string16 accname_app = l10n_util::GetStringUTF16(IDS_ACCNAME_APP);
+  if (type == WrenchMenuBadgeController::UPGRADE_NOTIFICATION) {
+    accname_app = l10n_util::GetStringFUTF16(
+        IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);
+  }
+  app_menu_->SetAccessibleName(accname_app);
+  app_menu_->SetSeverity(severity, animate);
+  SchedulePaint();

[sky, 2014/07/17 19:54:28]

I realize you're copying code here, but it seems like this SchedulePaint only
matters for app_menu_. I think the SchedulePaint should be moved to
WrenchToolbarButton::SetSeverity.

[Alexei Svitkine (slow), 2014/07/17 21:35:28]

Done.

+
+  // 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;
+  // Save the old value before resetting it.
+  bool was_showing = incompatibility_badge_showing;
+  incompatibility_badge_showing = false;
+
+  if (type == WrenchMenuBadgeController::INCOMPATIBILITY_WARNING) {
+    if (!was_showing) {
+      content::RecordAction(UserMetricsAction("ConflictBadge"));
+#if defined(OS_WIN)
+      ConflictingModuleView::MaybeShow(browser_, app_menu_);
 #endif
-}
-
-bool ToolbarView::ShouldShowIncompatibilityWarning() {
-#if defined(OS_WIN)
-  EnumerateModulesModel* loaded_modules = EnumerateModulesModel::GetInstance();
-  loaded_modules->MaybePostScanningTask();
-  return loaded_modules->ShouldShowConflictWarning();
-#else
-  return false;
-#endif
+    }
+    incompatibility_badge_showing = true;
+    return;
+  }
 }
 
 int ToolbarView::PopupTopSpacing() const {
   const int kPopupTopSpacingNonGlass = 3;
   return GetWidget()->ShouldWindowContentsBeTransparent() ?
       0 : kPopupTopSpacingNonGlass;
 }
 
 gfx::Size ToolbarView::SizeForContentSize(gfx::Size size) const {
   if (is_display_mode_normal()) {
@@ skipping 39 matching lines @@
 #endif
 }
 
 void ToolbarView::ShowOutdatedInstallNotification(bool auto_update_enabled) {
   if (OutdatedUpgradeBubbleView::IsAvailable()) {
     OutdatedUpgradeBubbleView::ShowBubble(
         app_menu_, browser_, auto_update_enabled);
   }
 }
 
-void ToolbarView::UpdateAppMenuState() {
-  base::string16 accname_app = l10n_util::GetStringUTF16(IDS_ACCNAME_APP);
-  if (ShouldShowUpgradeRecommended()) {
-    accname_app = l10n_util::GetStringFUTF16(
-        IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);
-  }
-  app_menu_->SetAccessibleName(accname_app);
-
-  UpdateWrenchButtonSeverity();
-  SchedulePaint();
-}
-
-void ToolbarView::UpdateWrenchButtonSeverity() {
-  // Showing the bubble requires |app_menu_| to be in a widget. See comment
-  // in ConflictingModuleView for details.
-  DCHECK(app_menu_->GetWidget());
-
-  // 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;
-  // Save the old value before resetting it.
-  bool was_showing = incompatibility_badge_showing;
-  incompatibility_badge_showing = false;
-
-  if (ShouldShowUpgradeRecommended()) {
-    UpgradeDetector::UpgradeNotificationAnnoyanceLevel level =
-        UpgradeDetector::GetInstance()->upgrade_notification_stage();
-    app_menu_->SetSeverity(WrenchIconPainter::SeverityFromUpgradeLevel(level),
-                           WrenchIconPainter::ShouldAnimateUpgradeLevel(level));
-    return;
-  }
-
-  if (ShouldShowIncompatibilityWarning()) {
-    if (!was_showing) {
-      content::RecordAction(UserMetricsAction("ConflictBadge"));
-#if defined(OS_WIN)
-      ConflictingModuleView::MaybeShow(browser_, app_menu_);
-#endif
-    }
-    app_menu_->SetSeverity(WrenchIconPainter::SEVERITY_MEDIUM, true);
-    incompatibility_badge_showing = true;
-    return;
-  }
-
-  GlobalErrorService* service =
-      GlobalErrorServiceFactory::GetForProfile(browser_->profile());
-  GlobalError* error =
-      service->GetHighestSeverityGlobalErrorWithWrenchMenuItem();
-  if (error) {
-    app_menu_->SetSeverity(WrenchIconPainter::GlobalErrorSeverity(), true);
-    return;
-  }
-
-  app_menu_->SetSeverity(WrenchIconPainter::SEVERITY_NONE, true);
-}
-
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?
       kContentShadowHeightAsh : kContentShadowHeight;
 }