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

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

Issue 211543008: Show a modified outdated upgrade Bubble for non-enterprise users without auto-update (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review comments 1. Created 6 years, 9 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.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index f26358b69d7f617c1906a4ab299ecd06f089105d..84fd539625027608a03609c206101cad55194e76 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -167,6 +167,8 @@ ToolbarView::ToolbarView(Browser* browser)
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,
@@ -521,7 +523,10 @@ void ToolbarView::Observe(int type,
UpdateAppMenuState();
break;
case chrome::NOTIFICATION_OUTDATED_INSTALL:
- ShowOutdatedInstallNotification();
+ ShowOutdatedInstallNotification(true);
+ break;
+ case chrome::NOTIFICATION_OUTDATED_INSTALL_NO_AU:
+ ShowOutdatedInstallNotification(false);
break;
#if defined(OS_WIN)
case chrome::NOTIFICATION_CRITICAL_UPGRADE_INSTALLED:
@@ -820,9 +825,11 @@ void ToolbarView::ShowCriticalNotification() {
#endif
}
-void ToolbarView::ShowOutdatedInstallNotification() {
- if (OutdatedUpgradeBubbleView::IsAvailable())
- OutdatedUpgradeBubbleView::ShowBubble(app_menu_, browser_);
+void ToolbarView::ShowOutdatedInstallNotification(bool auto_update_enabled) {
+ if (OutdatedUpgradeBubbleView::IsAvailable()) {
+ OutdatedUpgradeBubbleView::ShowBubble(
+ app_menu_, browser_, auto_update_enabled);
+ }
}
void ToolbarView::UpdateAppMenuState() {

Powered by Google App Engine
This is Rietveld 408576698