summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/cookies
diff options
context:
space:
mode:
authorlimasdf@gmail.com <limasdf@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-18 10:26:40 +0000
committerlimasdf@gmail.com <limasdf@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-18 10:26:40 +0000
commit9b44832024e41de8398265737601ab1992ffebc5 (patch)
tree6c9d0da9e58699ddfb3f0404b455493849874e5f /chrome/browser/extensions/api/cookies
parent65d906a6ab188025db5809a3674b7965eaa07f12 (diff)
downloadchromium_src-9b44832024e41de8398265737601ab1992ffebc5.zip
chromium_src-9b44832024e41de8398265737601ab1992ffebc5.tar.gz
chromium_src-9b44832024e41de8398265737601ab1992ffebc5.tar.bz2
Use EventRouter instead of ExtensionSystem::Get->event_router()
all clean-up BUG=362672 Review URL: https://codereview.chromium.org/238633009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/cookies')
-rw-r--r--chrome/browser/extensions/api/cookies/cookies_api.cc15
1 files changed, 5 insertions, 10 deletions
diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc
index 78ff3d7..4df4ef0 100644
--- a/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -25,7 +25,6 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
#include "extensions/browser/event_router.h"
-#include "extensions/browser/extension_system.h"
#include "extensions/common/error_utils.h"
#include "extensions/common/extension.h"
#include "extensions/common/permissions/permissions_data.h"
@@ -134,9 +133,7 @@ void CookiesEventRouter::DispatchEvent(content::BrowserContext* context,
const std::string& event_name,
scoped_ptr<base::ListValue> event_args,
GURL& cookie_domain) {
- EventRouter* router =
- context ? extensions::ExtensionSystem::Get(context)->event_router()
- : NULL;
+ EventRouter* router = context ? extensions::EventRouter::Get(context) : NULL;
if (!router)
return;
scoped_ptr<Event> event(new Event(event_name, event_args.Pass()));
@@ -562,16 +559,15 @@ void CookiesGetAllCookieStoresFunction::Run() {
CookiesAPI::CookiesAPI(content::BrowserContext* context)
: browser_context_(context) {
- ExtensionSystem::Get(browser_context_)->event_router()->RegisterObserver(
- this, cookies::OnChanged::kEventName);
+ EventRouter::Get(browser_context_)
+ ->RegisterObserver(this, cookies::OnChanged::kEventName);
}
CookiesAPI::~CookiesAPI() {
}
void CookiesAPI::Shutdown() {
- ExtensionSystem::Get(browser_context_)->event_router()->UnregisterObserver(
- this);
+ EventRouter::Get(browser_context_)->UnregisterObserver(this);
}
static base::LazyInstance<BrowserContextKeyedAPIFactory<CookiesAPI> >
@@ -585,8 +581,7 @@ BrowserContextKeyedAPIFactory<CookiesAPI>* CookiesAPI::GetFactoryInstance() {
void CookiesAPI::OnListenerAdded(
const extensions::EventListenerInfo& details) {
cookies_event_router_.reset(new CookiesEventRouter(browser_context_));
- ExtensionSystem::Get(browser_context_)->event_router()->UnregisterObserver(
- this);
+ EventRouter::Get(browser_context_)->UnregisterObserver(this);
}
} // namespace extensions