chrome/browser/ui/toolbar/wrench_menu_model.cc - Issue 211543008: Show a modified outdated upgrade Bubble for non-enterprise users without auto-update

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/toolbar/wrench_menu_model.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: 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/browser_commands.cc ('k') | chrome/browser/ui/views/outdated_upgrade_bubble_view.h » ('j') | chrome/browser/ui/views/outdated_upgrade_bubble_view.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/wrench_menu_model.cc

diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc

index b7cc8787607c4c4acd5cea0df3109d3edf31e04c..d7764595d5a623e710ddd1cd22bd17c2751893dc 100644

--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc

+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc

@@ -81,10 +81,9 @@ namespace {

// Conditionally return the update app menu item title based on upgrade detector

// state.

base::string16 GetUpgradeDialogMenuItemName() {

- if (UpgradeDetector::GetInstance()->is_outdated_install()) {

- return l10n_util::GetStringFUTF16(

- IDS_UPGRADE_BUBBLE_MENU_ITEM,

- l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));

+ if (UpgradeDetector::GetInstance()->is_outdated_install() ||

+ UpgradeDetector::GetInstance()->is_outdated_install_no_au()) {

+ return l10n_util::GetStringUTF16(IDS_UPGRADE_BUBBLE_MENU_ITEM);

} else {

return l10n_util::GetStringUTF16(IDS_UPDATE_NOW);

}