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

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: Shot in the dark to try and prevent Mac crashes... 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
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_view.h ('k') | chrome/browser/upgrade_detector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8c1ad88590e4283420dfa41b021a851806923c8c..e088f50f3d9f747c350425d7a3a690bd3d8ee334 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,
@@ -514,7 +516,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:
@@ -813,9 +818,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() {
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_view.h ('k') | chrome/browser/upgrade_detector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698