Index: chrome/browser/ui/webui/gesture_config_ui.cc |
diff --git a/chrome/browser/ui/webui/gesture_config_ui.cc b/chrome/browser/ui/webui/gesture_config_ui.cc |
index 6589f33d2027f251c851fd693b29e0e4beae144d..417d9edd787608195e0250ce3d62c8bba4af71a3 100644 |
--- a/chrome/browser/ui/webui/gesture_config_ui.cc |
+++ b/chrome/browser/ui/webui/gesture_config_ui.cc |
@@ -15,6 +15,10 @@ |
#include "grit/browser_resources.h" |
#include "grit/generated_resources.h" |
+#if defined(USE_ASH) |
+#include "ash/wm/workspace/workspace_cycler_configuration.h" |
+#endif // USE_ASH |
+ |
/** |
* WebUI for configuring 'gesture.*' preference values used by |
* Chrome's gesture recognition system. |
@@ -38,6 +42,11 @@ GestureConfigUI::GestureConfigUI(content::WebUI* web_ui) |
"setPreferenceValue", |
base::Bind(&GestureConfigUI::SetPreferenceValue, |
base::Unretained(this))); |
+ web_ui->RegisterMessageCallback( |
+ "checkShouldAddWorkspaceCyclerConfiguration", |
+ base::Bind( |
+ &GestureConfigUI::CheckShouldAddWorkspaceCyclerConfiguration, |
+ base::Unretained(this))); |
// Add required resources. |
html_source->AddResourcePath("gesture_config.css", IDR_GESTURE_CONFIG_CSS); |
@@ -122,3 +131,16 @@ void GestureConfigUI::SetPreferenceValue(const base::ListValue* args) { |
} |
} |
+ |
+void GestureConfigUI::CheckShouldAddWorkspaceCyclerConfiguration( |
+ const base::ListValue* args) { |
+ bool should_add = false; |
+#if defined(USE_ASH) |
+ should_add = ash::WorkspaceCyclerConfiguration::IsCyclerEnabled(); |
+#endif // USE_ASH |
+ |
+ web_ui()->CallJavascriptFunction( |
+ "gesture_config.checkShouldAddWorkspaceCyclerConfigurationResult", |
+ base::FundamentalValue(should_add)); |
+} |
+ |