Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Unified Diff: chrome/browser/extensions/api/input_ime/input_ime_api.cc

Issue 238633009: cleanup: Use EventRouter instead of ExtensionSystem::Get->event_router() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile error for chromeos build. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 31d596600ea072075ba20d2b93f54c2c94d2ea47..b97b427505c52f7041378cf3ead8dd2dcd507b44 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc
@@ -15,7 +15,6 @@
#include "content/public/browser/notification_source.h"
#include "extensions/browser/event_router.h"
#include "extensions/browser/extension_function_registry.h"
-#include "extensions/browser/extension_system.h"
#if defined(USE_X11)
#include "chrome/browser/chromeos/input_method/input_method_engine.h"
@@ -79,8 +78,8 @@ static void DispatchEventToExtension(Profile* profile,
scoped_ptr<extensions::Event> event(new extensions::Event(
event_name, args.Pass()));
event->restrict_to_browser_context = profile;
- extensions::ExtensionSystem::Get(profile)->event_router()->
- DispatchEventToExtension(extension_id, event.Pass());
+ extensions::EventRouter::Get(profile)
+ ->DispatchEventToExtension(extension_id, event.Pass());
}
} // namespace
@@ -280,8 +279,7 @@ class ImeObserver : public InputMethodEngineInterface::Observer {
private:
bool HasKeyEventListener() const {
- return extensions::ExtensionSystem::Get(profile_)
- ->event_router()
+ return extensions::EventRouter::Get(profile_)
->ExtensionHasEventListener(extension_id_,
input_ime::OnKeyEvent::kEventName);
}
@@ -786,13 +784,13 @@ InputImeAPI::InputImeAPI(content::BrowserContext* context)
chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
content::Source<Profile>(profile_));
- EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
+ EventRouter* event_router = EventRouter::Get(profile_);
event_router->RegisterObserver(this, input_ime::OnActivate::kEventName);
event_router->RegisterObserver(this, input_ime::OnFocus::kEventName);
}
InputImeAPI::~InputImeAPI() {
- ExtensionSystem::Get(profile_)->event_router()->UnregisterObserver(this);
+ EventRouter::Get(profile_)->UnregisterObserver(this);
}
static base::LazyInstance<BrowserContextKeyedAPIFactory<InputImeAPI> >

Powered by Google App Engine
This is Rietveld 408576698