Index: chrome/browser/chromeos/extensions/input_method_api.h |
diff --git a/chrome/browser/chromeos/extensions/input_method_api.h b/chrome/browser/chromeos/extensions/input_method_api.h |
index d7a4d7fdc2548dad5a2e6eab76f7e08d3f370da8..866422019cba27cf0f33e3cc7f6051d9a89a900e 100644 |
--- a/chrome/browser/chromeos/extensions/input_method_api.h |
+++ b/chrome/browser/chromeos/extensions/input_method_api.h |
@@ -17,30 +17,61 @@ class ExtensionInputMethodEventRouter; |
namespace extensions { |
-// Implements the experimental.inputMethod.get method. |
-class GetInputMethodFunction : public SyncExtensionFunction { |
+// Implements the inputMethodPrivate.getCurrentInputMethod method. |
+class GetCurrentInputMethodFunction : public UIThreadExtensionFunction { |
public: |
- GetInputMethodFunction(); |
+ GetCurrentInputMethodFunction() {} |
protected: |
- virtual ~GetInputMethodFunction(); |
+ virtual ~GetCurrentInputMethodFunction() {} |
- virtual bool RunSync() OVERRIDE; |
+ virtual ResponseAction Run() OVERRIDE; |
private: |
- DECLARE_EXTENSION_FUNCTION("inputMethodPrivate.get", INPUTMETHODPRIVATE_GET) |
+ DECLARE_EXTENSION_FUNCTION("inputMethodPrivate.getCurrentInputMethod", |
+ INPUTMETHODPRIVATE_GETCURRENTINPUTMETHOD) |
+}; |
+ |
+// Implements the inputMethodPrivate.setCurrentInputMethod method. |
+class SetCurrentInputMethodFunction : public UIThreadExtensionFunction { |
+ public: |
+ SetCurrentInputMethodFunction() {} |
+ |
+ protected: |
+ virtual ~SetCurrentInputMethodFunction() {} |
+ |
+ virtual ResponseAction Run() OVERRIDE; |
+ |
+ private: |
+ DECLARE_EXTENSION_FUNCTION("inputMethodPrivate.setCurrentInputMethod", |
+ INPUTMETHODPRIVATE_SETCURRENTINPUTMETHOD) |
+}; |
+ |
+// Implements the inputMethodPrivate.getInputMethods method. |
+class GetInputMethodsFunction : public UIThreadExtensionFunction { |
+ public: |
+ GetInputMethodsFunction() {} |
+ |
+ protected: |
+ virtual ~GetInputMethodsFunction() {} |
+ |
+ virtual ResponseAction Run() OVERRIDE; |
+ |
+ private: |
+ DECLARE_EXTENSION_FUNCTION("inputMethodPrivate.getInputMethods", |
+ INPUTMETHODPRIVATE_GETINPUTMETHODS) |
}; |
// Notify the initialization is done to input method engine. |
// TODO(nona): remove this function. |
-class StartImeFunction : public SyncExtensionFunction { |
+class StartImeFunction : public UIThreadExtensionFunction { |
public: |
StartImeFunction(); |
protected: |
virtual ~StartImeFunction(); |
- virtual bool RunSync() OVERRIDE; |
+ virtual ResponseAction Run() OVERRIDE; |
private: |
DECLARE_EXTENSION_FUNCTION("inputMethodPrivate.startIme", |