Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2806)

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_view.h

Issue 2925973002: Migrate upgrade notifications to observer (Closed)
Patch Set: Add DISALLOW_COPY_AND_ASSIGN Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..a90982b14476985e0f89862f500bb1464e931957 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,10 @@ 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;
+ void OnOutdatedInstallNoAutoUpdate() override;
+ void OnCriticalUpgradeInstalled() override;
// ui::AcceleratorProvider:
bool GetAcceleratorForCommandId(int command_id,
@@ -210,8 +211,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);
};
« no previous file with comments | « chrome/browser/ui/toolbar/app_menu_model_unittest.cc ('k') | chrome/browser/ui/views/toolbar/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698