Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(371)

Unified Diff: chrome/browser/ui/webui/options2/options_ui2.cc

Issue 9580023: Enable user change background image in settings page in Aura build. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: More refactor Created 8 years, 10 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 7bc72b8408d8c21b7710cf4a7a4cb407ec686db1..8d0997fbc98d17720446da460057f08370350b31 100644
--- a/chrome/browser/ui/webui/options2/options_ui2.cc
+++ b/chrome/browser/ui/webui/options2/options_ui2.cc
@@ -69,6 +69,7 @@
#include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.h"
#include "chrome/browser/ui/webui/options2/chromeos/pointer_handler2.h"
#include "chrome/browser/ui/webui/options2/chromeos/proxy_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.h"
flackr 2012/03/05 16:16:03 This seems inconsistent with everywhere else where
bshe 2012/03/06 01:33:27 Done. Put everything behind ash.
#include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h"
#include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h"
#include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.h"
@@ -217,6 +218,9 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)
new chromeos::options2::ProxyHandler());
AddOptionsPageUIHandler(
localized_strings,
+ new chromeos::options2::SetWallpaperOptionsHandler());
+ AddOptionsPageUIHandler(
+ localized_strings,
new chromeos::options2::ChangePictureOptionsHandler());
AddOptionsPageUIHandler(localized_strings,
new chromeos::options2::StatsOptionsHandler());

Powered by Google App Engine
This is Rietveld 408576698