chrome/browser/ui/webui/options2/browser_options_handler2.cc - Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui…

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/options2/browser_options_handler2.cc

Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui… (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Merge to trunk Created 8 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/resources/options2/options_bundle.js ('k') | chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/browser_options_handler2.cc

diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc

index 2a9dece6809536a8934de899e77ba214e9e2c8de..8ebc073034eeb6fd70ca18c037e09aebec72702a 100644

--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc

+++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc

@@ -299,6 +299,9 @@ void BrowserOptionsHandler::GetLocalizedValues(

IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLING_BUTTON },

{ "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON },

#endif

+#if defined(OS_CHROMEOS) && defined(USE_ASH)

+ { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },

+#endif

#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)

{ "advancedSectionTitleBackground",

IDS_OPTIONS_ADVANCED_SECTION_TITLE_BACKGROUND },