chrome/browser/ui/webui/help/version_updater_win.cc - Issue 17261014: Add support to Google Update wrappers for the "automatic updates only" group policy setting.

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/webui/help/version_updater_win.cc

Issue 17261014: Add support to Google Update wrappers for the "automatic updates only" group policy setting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 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/webui/help/version_updater_win.cc

===================================================================

--- chrome/browser/ui/webui/help/version_updater_win.cc (revision 205261)

+++ chrome/browser/ui/webui/help/version_updater_win.cc (working copy)

@@ -214,13 +214,17 @@

case UPGRADE_ERROR: {

content::RecordAction(UserMetricsAction("UpgradeCheck_Error"));

status = FAILED;

- if (error_code != GOOGLE_UPDATE_DISABLED_BY_POLICY) {

+ if (error_code == GOOGLE_UPDATE_DISABLED_BY_POLICY) {

message =

- l10n_util::GetStringFUTF16Int(IDS_UPGRADE_ERROR, error_code);

+ l10n_util::GetStringUTF16(IDS_UPGRADE_DISABLED_BY_POLICY);

+ } else if (error_code == GOOGLE_UPDATE_DISABLED_BY_POLICY_AUTO_ONLY) {

+ message =

+ l10n_util::GetStringUTF16(IDS_UPGRADE_DISABLED_BY_POLICY_MANUAL);

} else {

message =

- l10n_util::GetStringUTF16(IDS_UPGRADE_DISABLED_BY_POLICY);

+ l10n_util::GetStringFUTF16Int(IDS_UPGRADE_ERROR, error_code);

}

if (!error_message.empty()) {

message +=

l10n_util::GetStringFUTF16(IDS_ABOUT_BOX_ERROR_DURING_UPDATE_CHECK,

« no previous file with comments | « chrome/browser/google/google_update_win.cc ('k') | chrome/installer/util/google_update_settings.h » ('j') | no next file with comments »