chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc - Issue 11232066: Remove GetExtensionEventRouter from Profile.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc

Issue 11232066: Remove GetExtensionEventRouter from Profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 2 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

« chrome/browser/bookmarks/DEPS ('K') | « chrome/browser/extensions/api/terminal/terminal_private_api.cc ('k') | chrome/browser/extensions/bluetooth_event_router.cc » ('j') | chrome/browser/extensions/menu_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc

diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc

index 049fb095a03eeb05d658e0eb8554d6a90f2ca4de..590a2b1a244c756e5120c64622bb6a6b551ae0e5 100644

--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc

+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc

@@ -12,6 +12,7 @@

#include "base/values.h"

#include "chrome/browser/extensions/api/web_navigation/web_navigation_api_constants.h"

#include "chrome/browser/extensions/event_router.h"

+#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/extensions/extension_tab_util.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/extensions/event_filtering_info.h"

@@ -42,9 +43,10 @@ void DispatchEvent(content::BrowserContext* browser_context,

info.SetURL(url);

Profile* profile = Profile::FromBrowserContext(browser_context);

- if (profile && profile->GetExtensionEventRouter()) {

- profile->GetExtensionEventRouter()->DispatchEventToRenderers(

- event_name, args.Pass(), profile, GURL(), info);

+ if (profile && extensions::ExtensionSystem::Get(profile)->event_router()) {

+ extensions::ExtensionSystem::Get(profile)->event_router()->

+ DispatchEventToRenderers(event_name, args.Pass(), profile, GURL(),

+ info);

}