Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3496)

Unified Diff: chrome/browser/extensions/event_router_forwarder.cc

Issue 138213003: Revert hack introduced in r84247 to support Chrome Frame net tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/event_router_forwarder.cc
diff --git a/chrome/browser/extensions/event_router_forwarder.cc b/chrome/browser/extensions/event_router_forwarder.cc
index 9c123ed649c1051467f75383affcb6fe63a1a6d2..bf3919047c5abd6d65f2bb01a9ff55c64870a1c9 100644
--- a/chrome/browser/extensions/event_router_forwarder.cc
+++ b/chrome/browser/extensions/event_router_forwarder.cc
@@ -114,11 +114,13 @@ void EventRouterForwarder::CallEventRouter(
scoped_ptr<base::ListValue> event_args,
Profile* restrict_to_profile,
const GURL& event_url) {
- // We may not have an extension in cases like chromeos login
- // (crosbug.com/12856), chrome_frame_net_tests.exe which reuses the chrome
- // browser single process framework.
+#if defined(OS_CHROMEOS)
+ // Extension does not exist for chromeos login. This needs to be
+ // removed once we have an extension service for login screen.
+ // crosbug.com/12856.
if (!extensions::ExtensionSystem::Get(profile)->event_router())
return;
+#endif
scoped_ptr<Event> event(new Event(event_name, event_args.Pass()));
event->restrict_to_browser_context = restrict_to_profile;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698