chrome/browser/chromeos/extensions/file_handler_util.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/chromeos/extensions/file_handler_util.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/chromeos/extensions/file_browser_event_router.cc ('k') | chrome/browser/chromeos/extensions/input_method_event_router.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/extensions/file_handler_util.cc

diff --git a/chrome/browser/chromeos/extensions/file_handler_util.cc b/chrome/browser/chromeos/extensions/file_handler_util.cc

index 10345a640900fd4bb3b17b90b1c5196ea6f5850e..240e53d0ac4a9f3646dd3e56f6017f82e789c512 100644

--- a/chrome/browser/chromeos/extensions/file_handler_util.cc

+++ b/chrome/browser/chromeos/extensions/file_handler_util.cc

@@ -14,7 +14,7 @@

#include "chrome/browser/chromeos/gdata/gdata_util.h"

#include "chrome/browser/chromeos/extensions/file_manager_util.h"

#include "chrome/browser/chromeos/gdata/drive_task_executor.h"

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

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

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

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

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

@@ -804,7 +804,7 @@ void ExtensionTaskExecutor::SetupPermissionsAndDispatchEvent(

return;

}

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

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

if (!event_router) {

ExecuteDoneOnUIThread(false);

return;