| Index: chrome/browser/chromeos/extensions/input_ime_extension_api.h
|
| diff --git a/chrome/browser/extensions/extension_input_ime_api.h b/chrome/browser/chromeos/extensions/input_ime_extension_api.h
|
| similarity index 87%
|
| rename from chrome/browser/extensions/extension_input_ime_api.h
|
| rename to chrome/browser/chromeos/extensions/input_ime_extension_api.h
|
| index 32ecd04ef8d1c33d130ab117c1fe642a46c6512f..b3ecbc43b065812ded14c904211099280a6a0ee3 100644
|
| --- a/chrome/browser/extensions/extension_input_ime_api.h
|
| +++ b/chrome/browser/chromeos/extensions/input_ime_extension_api.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_INPUT_IME_API_H_
|
| -#define CHROME_BROWSER_EXTENSIONS_EXTENSION_INPUT_IME_API_H_
|
| +#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_INPUT_IME_EXTENSION_API_H_
|
| +#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_INPUT_IME_EXTENSION_API_H_
|
| #pragma once
|
|
|
| #include "chrome/browser/extensions/extension_function.h"
|
| @@ -24,9 +24,9 @@ class InputMethodEngine;
|
| class ImeObserver;
|
| }
|
|
|
| -class ExtensionInputImeEventRouter {
|
| +class InputImeExtensionEventRouter {
|
| public:
|
| - static ExtensionInputImeEventRouter* GetInstance();
|
| + static InputImeExtensionEventRouter* GetInstance();
|
| void Init();
|
|
|
| bool RegisterIme(Profile* profile,
|
| @@ -46,12 +46,12 @@ class ExtensionInputImeEventRouter {
|
| chromeos::input_method::KeyEventHandle* key_data);
|
|
|
| private:
|
| - friend struct DefaultSingletonTraits<ExtensionInputImeEventRouter>;
|
| + friend struct DefaultSingletonTraits<InputImeExtensionEventRouter>;
|
| typedef std::map<std::string, std::pair<std::string,
|
| chromeos::input_method::KeyEventHandle*> > RequestMap;
|
|
|
| - ExtensionInputImeEventRouter();
|
| - ~ExtensionInputImeEventRouter();
|
| + InputImeExtensionEventRouter();
|
| + ~InputImeExtensionEventRouter();
|
|
|
| std::map<std::string, std::map<std::string, chromeos::InputMethodEngine*> >
|
| engines_;
|
| @@ -61,7 +61,7 @@ class ExtensionInputImeEventRouter {
|
| unsigned int next_request_id_;
|
| RequestMap request_map_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ExtensionInputImeEventRouter);
|
| + DISALLOW_COPY_AND_ASSIGN(InputImeExtensionEventRouter);
|
| };
|
|
|
| class SetCompositionFunction : public AsyncExtensionFunction {
|
| @@ -130,4 +130,4 @@ class InputEventHandled : public AsyncExtensionFunction {
|
| DECLARE_EXTENSION_FUNCTION_NAME("experimental.input.ime.eventHandled");
|
| };
|
|
|
| -#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_INPUT_IME_API_H_
|
| +#endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_INPUT_IME_EXTENSION_API_H_
|
|
|