chrome/browser/extensions/api/managed_mode/managed_mode_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/managed_mode/managed_mode_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/extension_action/script_badge_apitest.cc ('k') | chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/managed_mode/managed_mode_api.cc

diff --git a/chrome/browser/extensions/api/managed_mode/managed_mode_api.cc b/chrome/browser/extensions/api/managed_mode/managed_mode_api.cc

index 3bbb47a1d769be1fa7a2fd102583fa0852c52167..dc50e136aa4df862ce5010d944f88652ceba3d8c 100644

--- a/chrome/browser/extensions/api/managed_mode/managed_mode_api.cc

+++ b/chrome/browser/extensions/api/managed_mode/managed_mode_api.cc

@@ -11,7 +11,7 @@

#include "base/bind.h"

#include "base/json/json_writer.h"

#include "chrome/browser/browser_process.h"

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

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

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

#include "chrome/browser/managed_mode.h"

#include "chrome/browser/prefs/pref_service.h"

@@ -67,7 +67,7 @@ void ExtensionManagedModeEventRouter::Observe(

g_browser_process->local_state()->GetBoolean(prefs::kInManagedMode));

std::string json_args;

base::JSONWriter::Write(&args, &json_args);

- ExtensionEventRouter* event_router = profile_->GetExtensionEventRouter();

+ extensions::EventRouter* event_router = profile_->GetExtensionEventRouter();

event_router->DispatchEventToRenderers(kChangeEventName, json_args, NULL,

GURL(),

extensions::EventFilteringInfo());