Chromium Code Reviews| 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>(); |