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 8ea8bb77106fcaacea147e1d08a60b84aeae11bc..b9d193221613acd9f92fc6ad12649c49f7c84dfd 100644 |
--- a/chrome/browser/extensions/extension_function_dispatcher.cc |
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc |
@@ -74,15 +74,12 @@ |
#include "chrome/browser/extensions/extension_input_api.h" |
#endif |
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI) |
-#include "chrome/browser/extensions/extension_input_ui_api.h" |
-#endif |
- |
#if defined(OS_CHROMEOS) |
#include "chrome/browser/extensions/extension_file_browser_private_api.h" |
#include "chrome/browser/extensions/extension_info_private_api_chromeos.h" |
#include "chrome/browser/extensions/extension_input_ime_api.h" |
#include "chrome/browser/extensions/extension_input_method_api.h" |
+#include "chrome/browser/extensions/extension_input_ui_api.h" |
Peng
2011/11/24 17:11:14
I think it is safer if we only enable input_ui api
|
#include "chrome/browser/extensions/extension_mediaplayer_private_api.h" |
#endif |
@@ -328,7 +325,6 @@ void FactoryRegistry::ResetFunctions() { |
RegisterFunction<UpdateMenuItemsFunction>(); |
RegisterFunction<InputEventHandled>(); |
-#if defined(TOUCH_UI) |
RegisterFunction<CandidateClickedInputUiFunction>(); |
Peng
2011/11/24 17:11:14
ditto
|
RegisterFunction<CursorUpInputUiFunction>(); |
RegisterFunction<CursorDownInputUiFunction>(); |
@@ -338,7 +334,6 @@ void FactoryRegistry::ResetFunctions() { |
RegisterFunction<PageUpInputUiFunction>(); |
RegisterFunction<PageDownInputUiFunction>(); |
#endif |
-#endif |
// Management. |
RegisterFunction<GetAllExtensionsFunction>(); |
@@ -411,12 +406,10 @@ void FactoryRegistry::ResetFunctions() { |
// InputMethod |
RegisterFunction<GetInputMethodFunction>(); |
-#if defined(TOUCH_UI) |
// Input |
Peng
2011/11/24 17:11:14
ditto
|
RegisterFunction<SendHandwritingStrokeFunction>(); |
RegisterFunction<CancelHandwritingStrokesFunction>(); |
#endif |
-#endif |
// Websocket to TCP proxy. Currently noop on anything other than ChromeOS. |
RegisterFunction<WebSocketProxyPrivateGetPassportForTCPFunction>(); |