diff options
Diffstat (limited to 'chrome/browser/chromeos')
7 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/extensions/OWNERS b/chrome/browser/chromeos/extensions/OWNERS index 26f386b..f77501b 100644 --- a/chrome/browser/chromeos/extensions/OWNERS +++ b/chrome/browser/chromeos/extensions/OWNERS @@ -19,3 +19,4 @@ zelidrag@chromium.org # bshe for wallpaper related files bshe@chromium.org +per-file input_method_api.cc=nona@chromium.org diff --git a/chrome/browser/chromeos/extensions/input_method_api.cc b/chrome/browser/chromeos/extensions/input_method_api.cc index 19ba748..dbe2834 100644 --- a/chrome/browser/chromeos/extensions/input_method_api.cc +++ b/chrome/browser/chromeos/extensions/input_method_api.cc @@ -57,7 +57,7 @@ bool StartImeFunction::RunImpl() { chromeos::InputMethodEngineInterface* engine = InputImeEventRouter::GetInstance()->GetActiveEngine(extension_id()); if (engine) - engine->StartIme(); + engine->NotifyImeReady(); return true; #endif } diff --git a/chrome/browser/chromeos/input_method/input_method_engine.cc b/chrome/browser/chromeos/input_method/input_method_engine.cc index 7fe3d93..42bfc58 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine.cc @@ -122,7 +122,7 @@ const input_method::InputMethodDescriptor& InputMethodEngine::GetDescriptor() return descriptor_; } -void InputMethodEngine::StartIme() { +void InputMethodEngine::NotifyImeReady() { input_method::InputMethodManager* manager = input_method::InputMethodManager::Get(); if (manager && imm_id_ == manager->GetCurrentInputMethod().id()) diff --git a/chrome/browser/chromeos/input_method/input_method_engine.h b/chrome/browser/chromeos/input_method/input_method_engine.h index e365228..e35d9b3 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine.h +++ b/chrome/browser/chromeos/input_method/input_method_engine.h @@ -50,7 +50,7 @@ class InputMethodEngine : public InputMethodEngineInterface { // InputMethodEngineInterface overrides. virtual const input_method::InputMethodDescriptor& GetDescriptor() const OVERRIDE; - virtual void StartIme() OVERRIDE; + virtual void NotifyImeReady() OVERRIDE; virtual bool SetComposition(int context_id, const char* text, int selection_start, diff --git a/chrome/browser/chromeos/input_method/input_method_engine_interface.h b/chrome/browser/chromeos/input_method/input_method_engine_interface.h index e52f568..67a972c 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_interface.h +++ b/chrome/browser/chromeos/input_method/input_method_engine_interface.h @@ -174,9 +174,7 @@ class InputMethodEngineInterface : public IMEEngineHandlerInterface { virtual const input_method::InputMethodDescriptor& GetDescriptor() const = 0; // Called when the input metho initialization is done. - // This function is called from private API. - // TODO(nona): Remove this function. - virtual void StartIme() = 0; + virtual void NotifyImeReady() = 0; // Set the current composition and associated properties. virtual bool SetComposition(int context_id, diff --git a/chrome/browser/chromeos/input_method/mock_input_method_engine.cc b/chrome/browser/chromeos/input_method/mock_input_method_engine.cc index 5be5040..2b16e22 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_engine.cc +++ b/chrome/browser/chromeos/input_method/mock_input_method_engine.cc @@ -19,7 +19,7 @@ MockInputMethodEngine::GetDescriptor() const { return descriptor_; } -void MockInputMethodEngine::StartIme() { +void MockInputMethodEngine::NotifyImeReady() { } bool MockInputMethodEngine::SetComposition( diff --git a/chrome/browser/chromeos/input_method/mock_input_method_engine.h b/chrome/browser/chromeos/input_method/mock_input_method_engine.h index 9c0de63..0ec18eb 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_engine.h +++ b/chrome/browser/chromeos/input_method/mock_input_method_engine.h @@ -39,7 +39,7 @@ class MockInputMethodEngine : public InputMethodEngineInterface { // InputMethodEngineInterface overrides. virtual const input_method::InputMethodDescriptor& GetDescriptor() const OVERRIDE; - virtual void StartIme() OVERRIDE; + virtual void NotifyImeReady() OVERRIDE; virtual bool SetComposition(int context_id, const char* text, int selection_start, |