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

Unified Diff: chrome/browser/extensions/extension_function_dispatcher.cc

Issue 7033033: Add hideKeyboard API to chrome.experimental.input. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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/extensions/extension_function_dispatcher.cc
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index a64d6a1c6369f3436b6fefa670bda5a1190dc254..663c75e592bcfc5f4da7f774cb2e0a60f4b1c74c 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -60,7 +60,7 @@
#include "chrome/browser/extensions/extension_input_api.h"
#endif
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(TOUCH_UI)
#include "chrome/browser/extensions/extension_input_ui_api.h"
#endif
@@ -274,7 +274,8 @@ void FactoryRegistry::ResetFunctions() {
RegisterFunction<SendKeyboardEventInputFunction>();
#endif
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(TOUCH_UI)
+#if defined(OS_CHROMEOS)
bryeung 2011/05/19 22:23:42 Is this suggested style? I'd prefer we did not ne
mazda 2011/05/20 12:16:05 I moved the code to extension_input_api.* and reve
// IME
RegisterFunction<CandidateClickedInputUiFunction>();
RegisterFunction<CursorUpInputUiFunction>();
@@ -284,7 +285,9 @@ void FactoryRegistry::ResetFunctions() {
RegisterFunction<RegisterInputUiFunction>();
RegisterFunction<PageUpInputUiFunction>();
RegisterFunction<PageDownInputUiFunction>();
-#endif
+#endif // OS_CHROMEOS
+ RegisterFunction<HideKeyboardInputUiFunction>();
+#endif // TOUCH_UI
// Management.
RegisterFunction<GetAllExtensionsFunction>();
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_input_ui_api.h » ('j') | chrome/browser/extensions/extension_input_ui_api.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698