Index: chrome/browser/extensions/api/input_ime/input_ime_api.cc |
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc |
index df0f010e49a1007d1336ddc781e637baa65eca36..fb5838cee48d906daafacfef9e0785365f12c26c 100644 |
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc |
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc |
@@ -11,6 +11,7 @@ |
#include "chrome/browser/chromeos/input_method/input_method_engine.h" |
#include "chrome/browser/extensions/event_router.h" |
#include "chrome/browser/extensions/extension_input_module_constants.h" |
+#include "chrome/browser/extensions/extension_system.h" |
#include "chrome/browser/profiles/profile.h" |
namespace keys = extension_input_module_constants; |
@@ -158,8 +159,9 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
scoped_ptr<base::ListValue> args(new ListValue()); |
args->Append(Value::CreateStringValue(engine_id)); |
- profile_->GetExtensionEventRouter()->DispatchEventToExtension( |
- extension_id_, events::kOnActivate, args.Pass(), profile_, GURL()); |
+ extensions::ExtensionSystem::Get(profile_)->event_router()-> |
+ DispatchEventToExtension(extension_id_, events::kOnActivate, |
+ args.Pass(), profile_, GURL()); |
} |
virtual void OnDeactivated(const std::string& engine_id) { |
@@ -169,8 +171,9 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
scoped_ptr<base::ListValue> args(new ListValue()); |
args->Append(Value::CreateStringValue(engine_id)); |
- profile_->GetExtensionEventRouter()->DispatchEventToExtension( |
- extension_id_, events::kOnDeactivated, args.Pass(), profile_, GURL()); |
+ extensions::ExtensionSystem::Get(profile_)->event_router()-> |
+ DispatchEventToExtension(extension_id_, events::kOnDeactivated, |
+ args.Pass(), profile_, GURL()); |
} |
virtual void OnFocus(const InputMethodEngine::InputContext& context) { |
@@ -184,8 +187,9 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
scoped_ptr<base::ListValue> args(new ListValue()); |
args->Append(dict); |
- profile_->GetExtensionEventRouter()->DispatchEventToExtension( |
- extension_id_, events::kOnFocus, args.Pass(), profile_, GURL()); |
+ extensions::ExtensionSystem::Get(profile_)->event_router()-> |
+ DispatchEventToExtension(extension_id_, events::kOnFocus, |
+ args.Pass(), profile_, GURL()); |
} |
virtual void OnBlur(int context_id) { |
@@ -195,8 +199,9 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
scoped_ptr<base::ListValue> args(new ListValue()); |
args->Append(Value::CreateIntegerValue(context_id)); |
- profile_->GetExtensionEventRouter()->DispatchEventToExtension( |
- extension_id_, events::kOnBlur, args.Pass(), profile_, GURL()); |
+ extensions::ExtensionSystem::Get(profile_)->event_router()-> |
+ DispatchEventToExtension(extension_id_, events::kOnBlur, |
+ args.Pass(), profile_, GURL()); |
} |
virtual void OnInputContextUpdate( |
@@ -211,9 +216,9 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
scoped_ptr<base::ListValue> args(new ListValue()); |
args->Append(dict); |
- profile_->GetExtensionEventRouter()->DispatchEventToExtension( |
- extension_id_, events::kOnInputContextUpdate, args.Pass(), profile_, |
- GURL()); |
+ extensions::ExtensionSystem::Get(profile_)->event_router()-> |
+ DispatchEventToExtension(extension_id_, events::kOnInputContextUpdate, |
+ args.Pass(), profile_, GURL()); |
} |
virtual void OnKeyEvent(const std::string& engine_id, |
@@ -238,8 +243,9 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
args->Append(Value::CreateStringValue(engine_id)); |
args->Append(dict); |
- profile_->GetExtensionEventRouter()->DispatchEventToExtension( |
- extension_id_, events::kOnKeyEvent, args.Pass(), profile_, GURL()); |
+ extensions::ExtensionSystem::Get(profile_)->event_router()-> |
+ DispatchEventToExtension(extension_id_, events::kOnKeyEvent, |
+ args.Pass(), profile_, GURL()); |
} |
virtual void OnCandidateClicked( |
@@ -268,9 +274,9 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
break; |
} |
- profile_->GetExtensionEventRouter()->DispatchEventToExtension( |
- extension_id_, events::kOnCandidateClicked, args.Pass(), profile_, |
- GURL()); |
+ extensions::ExtensionSystem::Get(profile_)->event_router()-> |
+ DispatchEventToExtension(extension_id_, events::kOnCandidateClicked, |
+ args.Pass(), profile_, GURL()); |
} |
virtual void OnMenuItemActivated(const std::string& engine_id, |
@@ -282,9 +288,9 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { |
args->Append(Value::CreateStringValue(engine_id)); |
args->Append(Value::CreateStringValue(menu_id)); |
- profile_->GetExtensionEventRouter()->DispatchEventToExtension( |
- extension_id_, events::kOnMenuItemActivated, args.Pass(), profile_, |
- GURL()); |
+ extensions::ExtensionSystem::Get(profile_)->event_router()-> |
+ DispatchEventToExtension(extension_id_, events::kOnMenuItemActivated, |
+ args.Pass(), profile_, GURL()); |
} |
private: |