summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/event_router_forwarder.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 22:34:41 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 22:34:41 +0000
commitaeca23fd8d2a00723b2cb9791054f5ff11034004 (patch)
treec360d46857a7c634460e99d2e90cec7017126843 /chrome/browser/extensions/event_router_forwarder.cc
parent5e4c87570711035dd18092ecbfcd47bf4f2d1e6c (diff)
downloadchromium_src-aeca23fd8d2a00723b2cb9791054f5ff11034004.zip
chromium_src-aeca23fd8d2a00723b2cb9791054f5ff11034004.tar.gz
chromium_src-aeca23fd8d2a00723b2cb9791054f5ff11034004.tar.bz2
Convert most of extensions and some other random stuff to using the base namespace for Values.
R=finnur@chromium.org Review URL: https://codereview.chromium.org/16915006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/event_router_forwarder.cc')
-rw-r--r--chrome/browser/extensions/event_router_forwarder.cc18
1 files changed, 10 insertions, 8 deletions
diff --git a/chrome/browser/extensions/event_router_forwarder.cc b/chrome/browser/extensions/event_router_forwarder.cc
index 50b0d8f..f04c16e 100644
--- a/chrome/browser/extensions/event_router_forwarder.cc
+++ b/chrome/browser/extensions/event_router_forwarder.cc
@@ -69,7 +69,7 @@ void EventRouterForwarder::DispatchEventToExtension(
void EventRouterForwarder::HandleEvent(const std::string& extension_id,
const std::string& event_name,
- scoped_ptr<ListValue> event_args,
+ scoped_ptr<base::ListValue> event_args,
void* profile_ptr,
bool use_profile_to_restrict_events,
const GURL& event_url) {
@@ -98,7 +98,8 @@ void EventRouterForwarder::HandleEvent(const std::string& extension_id,
} else {
std::vector<Profile*> profiles(profile_manager->GetLoadedProfiles());
for (size_t i = 0; i < profiles.size(); ++i) {
- scoped_ptr<ListValue> per_profile_event_args(event_args->DeepCopy());
+ scoped_ptr<base::ListValue> per_profile_event_args(
+ event_args->DeepCopy());
CallEventRouter(
profiles[i], extension_id, event_name, per_profile_event_args.Pass(),
use_profile_to_restrict_events ? profiles[i] : NULL, event_url);
@@ -106,12 +107,13 @@ void EventRouterForwarder::HandleEvent(const std::string& extension_id,
}
}
-void EventRouterForwarder::CallEventRouter(Profile* profile,
- const std::string& extension_id,
- const std::string& event_name,
- scoped_ptr<ListValue> event_args,
- Profile* restrict_to_profile,
- const GURL& event_url) {
+void EventRouterForwarder::CallEventRouter(
+ Profile* profile,
+ const std::string& extension_id,
+ const std::string& event_name,
+ 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.