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

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

Issue 10698099: Implement the new wallpaper manager launcher window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk Created 8 years, 5 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/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 4ccf5f5b158787fc74f4492d55d5c5be0affb93d..86e06b221e7875f324af1c208696439ca36d7c75 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
@@ -84,6 +84,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
#include "chrome/browser/chromeos/cros_settings.h"
+#include "chrome/browser/chromeos/extensions/wallpaper_manager_api.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/options/take_photo_dialog.h"
#include "chrome/browser/ui/browser_window.h"
@@ -518,6 +519,10 @@ void BrowserOptionsHandler::RegisterMessages() {
#endif
#if defined(OS_CHROMEOS)
web_ui()->RegisterMessageCallback(
+ "openWallpaperManager",
+ base::Bind(&BrowserOptionsHandler::HandleOpenWallpaperManager,
+ base::Unretained(this)));
+ web_ui()->RegisterMessageCallback(
"spokenFeedbackChange",
base::Bind(&BrowserOptionsHandler::SpokenFeedbackChangeCallback,
base::Unretained(this)));
@@ -1256,6 +1261,11 @@ void BrowserOptionsHandler::RemoveCloudPrintConnectorSection() {
#endif
#if defined(OS_CHROMEOS)
+void BrowserOptionsHandler::HandleOpenWallpaperManager(
+ const ListValue* args) {
+ wallpaper_manager_util::OpenWallpaperManager();
+}
+
void BrowserOptionsHandler::SpokenFeedbackChangeCallback(
const ListValue* args) {
bool enabled = false;

Powered by Google App Engine
This is Rietveld 408576698