chrome/browser/extensions/api/web_request/web_request_api.cc - Issue 10696208: Move ExtensionEventRouter and related into extensions namespace

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_request/web_request_api.cc

Issue 10696208: Move ExtensionEventRouter and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fixed bug + latest master Created 8 years, 5 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

« no previous file with comments | « chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc ('k') | chrome/browser/extensions/api/web_request/web_request_api_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_request/web_request_api.cc

diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc

index 2019494bf36a5895d66edded30aa55dcd85545d1..e3d168a1b972feff341792f1ab2d85ec92f5fd00 100644

--- a/chrome/browser/extensions/api/web_request/web_request_api.cc

+++ b/chrome/browser/extensions/api/web_request/web_request_api.cc

@@ -22,7 +22,7 @@

#include "chrome/browser/extensions/api/web_request/web_request_api_constants.h"

#include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"

#include "chrome/browser/extensions/api/web_request/web_request_time_tracker.h"

-#include "chrome/browser/extensions/extension_event_router.h"

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

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

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

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

@@ -31,6 +31,7 @@

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

#include "chrome/browser/renderer_host/chrome_render_message_filter.h"

#include "chrome/browser/renderer_host/web_cache_manager.h"

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

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

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

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

@@ -930,10 +931,10 @@ bool ExtensionWebRequestEventRouter::DispatchEvent(

base::JSONWriter::Write(args_filtered.get(), &json_args);

- ExtensionEventRouter::DispatchEvent(

+ extensions::EventRouter::DispatchEvent(

(*it)->ipc_sender.get(), (*it)->extension_id, (*it)->sub_event_name,

- json_args, GURL(), ExtensionEventRouter::USER_GESTURE_UNKNOWN,

- EventFilteringInfo());

+ json_args, GURL(), extensions::EventRouter::USER_GESTURE_UNKNOWN,

+ extensions::EventFilteringInfo());

if ((*it)->extra_info_spec &

(ExtraInfoSpec::BLOCKING | ExtraInfoSpec::ASYNC_BLOCKING)) {

(*it)->blocked_requests.insert(request->identifier());