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

Unified Diff: chrome/browser/extensions/system/system_api.cc

Issue 10919299: Revert 156744 - chromeos: Use EventRouterForwarder to disptch systemPrivate extension events (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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/system/system_api.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/system/system_api.cc
===================================================================
--- chrome/browser/extensions/system/system_api.cc (revision 156864)
+++ chrome/browser/extensions/system/system_api.cc (working copy)
@@ -4,11 +4,12 @@
#include "chrome/browser/extensions/system/system_api.h"
+#include "base/json/json_writer.h"
#include "base/values.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/extensions/event_router_forwarder.h"
+#include "chrome/browser/extensions/event_router.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/pref_names.h"
#if defined(OS_CHROMEOS)
@@ -47,14 +48,23 @@
const char kOnScreenUnlocked[] = "systemPrivate.onScreenUnlocked";
const char kOnWokeUp[] = "systemPrivate.onWokeUp";
-// Dispatches an extension event with |argument|
+// Dispatches an extension event with |args|
void DispatchEvent(const std::string& event_name, base::Value* argument) {
+ Profile* profile = ProfileManager::GetDefaultProfile();
+ if (!profile)
+ return;
+ extensions::EventRouter* extension_event_router =
+ profile->GetExtensionEventRouter();
+ if (!extension_event_router)
+ return;
+
scoped_ptr<base::ListValue> list_args(new base::ListValue());
if (argument) {
list_args->Append(argument);
}
- g_browser_process->extension_event_router_forwarder()->
- BroadcastEventToRenderers(event_name, list_args.Pass(), GURL());
+ extension_event_router->DispatchEventToRenderers(
+ event_name, list_args.Pass(), NULL, GURL(),
+ extensions::EventFilteringInfo());
}
} // namespace
« no previous file with comments | « chrome/browser/extensions/system/system_api.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698