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

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

Issue 10698099: Implement the new wallpaper manager launcher window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix presubmit errors 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
« no previous file with comments | « chrome/browser/ui/webui/options2/browser_options_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options2/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler.cc b/chrome/browser/ui/webui/options2/browser_options_handler.cc
index e4f6339001e4892f9dd2c6f5df9a311ddffdde11..3c80c1b5496af617214322348ed146450f00ff55 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options2/browser_options_handler.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/chromeos/system_settings_provider.h"
@@ -520,6 +521,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)));
@@ -1277,6 +1282,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;
« no previous file with comments | « chrome/browser/ui/webui/options2/browser_options_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698