| Index: chrome/browser/extensions/extension_function_registry.cc
|
| diff --git a/chrome/browser/extensions/extension_function_registry.cc b/chrome/browser/extensions/extension_function_registry.cc
|
| index e7f8c3e3b5f07bf088c9cc4e5ca78677969fef07..3619cf5d35963071ff580b8e808f26f627a73a78 100644
|
| --- a/chrome/browser/extensions/extension_function_registry.cc
|
| +++ b/chrome/browser/extensions/extension_function_registry.cc
|
| @@ -62,9 +62,9 @@
|
| #include "chrome/browser/chromeos/extensions/file_browser_handler_api.h"
|
| #include "chrome/browser/chromeos/extensions/file_browser_private_api.h"
|
| #include "chrome/browser/chromeos/media/media_player_extension_api.h"
|
| +#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
|
| #include "chrome/browser/extensions/api/terminal/terminal_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"
|
| #endif
|
|
|
| @@ -281,16 +281,16 @@ void ExtensionFunctionRegistry::ResetFunctions() {
|
|
|
| #if defined(OS_CHROMEOS)
|
| // IME
|
| - RegisterFunction<SetCompositionFunction>();
|
| - RegisterFunction<ClearCompositionFunction>();
|
| - RegisterFunction<CommitTextFunction>();
|
| - RegisterFunction<SetCandidateWindowPropertiesFunction>();
|
| - RegisterFunction<SetCandidatesFunction>();
|
| - RegisterFunction<SetCursorPositionFunction>();
|
| - RegisterFunction<SetMenuItemsFunction>();
|
| - RegisterFunction<UpdateMenuItemsFunction>();
|
| -
|
| - RegisterFunction<InputEventHandled>();
|
| + RegisterFunction<extensions::SetCompositionFunction>();
|
| + RegisterFunction<extensions::ClearCompositionFunction>();
|
| + RegisterFunction<extensions::CommitTextFunction>();
|
| + RegisterFunction<extensions::SetCandidateWindowPropertiesFunction>();
|
| + RegisterFunction<extensions::SetCandidatesFunction>();
|
| + RegisterFunction<extensions::SetCursorPositionFunction>();
|
| + RegisterFunction<extensions::SetMenuItemsFunction>();
|
| + RegisterFunction<extensions::UpdateMenuItemsFunction>();
|
| +
|
| + RegisterFunction<extensions::InputEventHandled>();
|
| #endif
|
|
|
| // Managed mode.
|
|
|