chrome/browser/ui/webui/options2/options_ui2.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/options_ui2.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

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

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

index fe559e6f1248692d3a8531270d1bbed51d08ef22..f4215d8040a8feaafd63ea812d230aeee8009572 100644

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

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

@@ -77,6 +77,10 @@

#include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.h"

#endif

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

+#include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.h"

+#endif

#if defined(USE_NSS)

#include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h"

#endif

@@ -226,6 +230,11 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)

AddOptionsPageUIHandler(localized_strings,

new chromeos::options2::StatsOptionsHandler());

#endif

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

+ AddOptionsPageUIHandler(

+ localized_strings,

+ new chromeos::options2::SetWallpaperOptionsHandler());

+#endif

#if defined(USE_NSS)

AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler());

#endif

« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »