Migrate upgrade notifications to observer

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

Index: chrome/browser/ui/views/toolbar/toolbar_view.h
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h
index 983977ac7592b8b0c2d808ffe1ecc94675911d60..4c95c73e7d5937b83d20ffe447fb9f81aace9399 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -13,6 +13,7 @@
 #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 "chrome/browser/upgrade_observer.h"
 #include "components/prefs/pref_member.h"
 #include "components/translate/core/browser/translate_step.h"
 #include "components/translate/core/common/translate_errors.h"
@@ -43,10 +44,10 @@ class ToolbarView : public views::AccessiblePaneView,
                     public views::MenuButtonListener,
                     public ui::AcceleratorProvider,
                     public LocationBarView::Delegate,
-                    public content::NotificationObserver,
                     public CommandObserver,
                     public views::ButtonListener,
-                    public AppMenuIconController::Delegate {
+                    public AppMenuIconController::Delegate,
+                    public UpgradeObserver {
  public:
   // The view class name.
   static const char kViewClassName[];
@@ -130,10 +131,16 @@ class ToolbarView : public views::AccessiblePaneView,
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
-  // content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
+  // UpgradeObserver implementation.
+  void OnOutdatedInstall() override;
+
+  // UpgradeObserver implementation.

[sky, 2017/06/07 23:01:41]

Similar comment about merging.

[weidongg, 2017/06/08 02:28:42]

Done.

+  void OnOutdatedInstallNoAU() override;
+
+#if defined(OS_WIN)
+  // UpgradeObserver implementation.
+  void OnCriticalUpgradeInstalled() override;

[sky, 2017/06/07 23:01:41]

How about always overriding this function, and move the ifdef to the
implementation? Less ifdefs that way.

[weidongg, 2017/06/08 02:28:42]

Done.

+#endif
 
   // ui::AcceleratorProvider:
   bool GetAcceleratorForCommandId(int command_id,
@@ -210,8 +217,6 @@ class ToolbarView : public views::AccessiblePaneView,
   // The display mode used when laying out the toolbar.
   const DisplayMode display_mode_;
 
-  content::NotificationRegistrar registrar_;
-
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
 };