| Index: chrome/browser/extensions/extension_input_ime_api.cc
|
| diff --git a/chrome/browser/extensions/extension_input_ime_api.cc b/chrome/browser/extensions/extension_input_ime_api.cc
|
| index 22ddd911897d397a575190047f8b1e28b5708194..a79199639baabd21678d1c4765fa142e6ce18b9c 100644
|
| --- a/chrome/browser/extensions/extension_input_ime_api.cc
|
| +++ b/chrome/browser/extensions/extension_input_ime_api.cc
|
| @@ -124,7 +124,7 @@ bool ReadMenuItems(
|
| return true;
|
| }
|
|
|
| -}
|
| +} // namespace
|
|
|
| namespace events {
|
|
|
| @@ -149,8 +149,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer {
|
| engine_id_(engine_id) {
|
| }
|
|
|
| - virtual ~ImeObserver() {
|
| - }
|
| + virtual ~ImeObserver() {}
|
|
|
| virtual void OnActivate(const std::string& engine_id) {
|
| if (profile_ == NULL || extension_id_.empty())
|
| @@ -311,23 +310,15 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer {
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ImeObserver);
|
| };
|
| -} // namespace chromeos
|
|
|
| +} // namespace chromeos
|
|
|
| ExtensionInputImeEventRouter*
|
| ExtensionInputImeEventRouter::GetInstance() {
|
| return Singleton<ExtensionInputImeEventRouter>::get();
|
| }
|
|
|
| -ExtensionInputImeEventRouter::ExtensionInputImeEventRouter()
|
| - : next_request_id_(1) {
|
| -}
|
| -
|
| -ExtensionInputImeEventRouter::~ExtensionInputImeEventRouter() {
|
| -}
|
| -
|
| -void ExtensionInputImeEventRouter::Init() {
|
| -}
|
| +void ExtensionInputImeEventRouter::Init() {}
|
|
|
| #if defined(OS_CHROMEOS)
|
| bool ExtensionInputImeEventRouter::RegisterIme(
|
| @@ -465,6 +456,12 @@ std::string ExtensionInputImeEventRouter::AddRequest(
|
| return request_id;
|
| }
|
|
|
| +ExtensionInputImeEventRouter::ExtensionInputImeEventRouter()
|
| + : next_request_id_(1) {
|
| +}
|
| +
|
| +ExtensionInputImeEventRouter::~ExtensionInputImeEventRouter() {}
|
| +
|
| bool SetCompositionFunction::RunImpl() {
|
| chromeos::InputMethodEngine* engine =
|
| ExtensionInputImeEventRouter::GetInstance()->
|
|
|