chrome/browser/chromeos/file_manager/file_browser_handlers.cc - Issue 238633009: cleanup: Use EventRouter instead of ExtensionSystem::Get->event_router()

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/file_manager/file_browser_handlers.cc

Issue 238633009: cleanup: Use EventRouter instead of ExtensionSystem::Get->event_router() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix compile error for chromeos build. Created 6 years, 8 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_manager/event_router.cc ('k') | chrome/browser/chromeos/file_system_provider/service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/file_manager/file_browser_handlers.cc

diff --git a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc

index 96728e802146bc606430f136afc1f4c51a10fabb..e5935e4920b782992649d047e7472cf42739a415 100644

--- a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc

+++ b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc

@@ -359,9 +359,8 @@ void FileBrowserHandlerExecutor::SetupPermissionsAndDispatchEvent(

return;

}

- extensions::EventRouter* event_router =

- extensions::ExtensionSystem::Get(profile_)->event_router();

- if (!event_router) {

+ extensions::EventRouter* router = extensions::EventRouter::Get(profile_);

+ if (!router) {

ExecuteDoneOnUIThread(false);

return;

}

@@ -394,7 +393,7 @@ void FileBrowserHandlerExecutor::SetupPermissionsAndDispatchEvent(

scoped_ptr<extensions::Event> event(new extensions::Event(

"fileBrowserHandler.onExecute", event_args.Pass()));

event->restrict_to_browser_context = profile_;

- event_router->DispatchEventToExtension(extension_->id(), event.Pass());

+ router->DispatchEventToExtension(extension_->id(), event.Pass());

ExecuteDoneOnUIThread(true);

}