Migrate upgrade notifications to observer

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_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"
 #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 10 matching lines @@
 
 namespace bookmarks {
 class BookmarkBubbleObserver;
 }
 
 // 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 AppMenuIconController::Delegate {
+                    public AppMenuIconController::Delegate,
+                    public UpgradeObserver {
  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 63 matching lines @@
   ContentSettingBubbleModelDelegate* GetContentSettingBubbleModelDelegate()
       override;
   void ShowPageInfo(content::WebContents* web_contents) override;
 
   // CommandObserver:
   void EnabledStateChangedForCommand(int id, bool enabled) override;
 
   // 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,
                                   ui::Accelerator* accelerator) const override;
 
   // views::View:
   gfx::Size CalculatePreferredSize() const override;
   gfx::Size GetMinimumSize() const override;
   void Layout() override;
   void OnThemeChanged() override;
@@ skipping 56 matching lines @@
   Browser* browser_;
 
   AppMenuIconController app_menu_icon_controller_;
 
   // 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_