| 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..2849d6fdef65c8a1f17e375ebf3ee09472ef2d8d 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,9 @@ void ToolbarView::ShowCriticalNotification() {
|
| #endif
|
| }
|
|
|
| -void ToolbarView::ShowOutdatedInstallNotification() {
|
| +void ToolbarView::ShowOutdatedInstallNotification(bool auto_update_on) {
|
| if (OutdatedUpgradeBubbleView::IsAvailable())
|
| - OutdatedUpgradeBubbleView::ShowBubble(app_menu_, browser_);
|
| + OutdatedUpgradeBubbleView::ShowBubble(app_menu_, browser_, auto_update_on);
|
| }
|
|
|
| void ToolbarView::UpdateAppMenuState() {
|
|
|