summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/event_router.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/event_router.cc')
-rw-r--r--chrome/browser/extensions/event_router.cc16
1 files changed, 10 insertions, 6 deletions
diff --git a/chrome/browser/extensions/event_router.cc b/chrome/browser/extensions/event_router.cc
index 72e0f52..4a75636 100644
--- a/chrome/browser/extensions/event_router.cc
+++ b/chrome/browser/extensions/event_router.cc
@@ -119,7 +119,7 @@ void EventRouter::LogExtensionEventMessage(void* profile_id,
LOG(WARNING) << "Extension " << extension_id << " not found!";
} else {
extensions::ActivityLog::GetInstance(profile)->LogEventAction(
- extension, event_name, event_args.get(), std::string());
+ extension, event_name, event_args.get(), "");
}
}
}
@@ -243,8 +243,10 @@ void EventRouter::OnListenerAdded(const EventListener* listener) {
scoped_ptr<ListValue> args(new ListValue());
if (listener->filter)
args->Append(listener->filter->DeepCopy());
- activity_log_->LogAPIAction(
- extension, event_name + ".addListener", args.get(), std::string());
+ activity_log_->LogAPIAction(extension,
+ event_name + ".addListener",
+ args.get(),
+ "");
}
}
@@ -269,8 +271,10 @@ void EventRouter::OnListenerRemoved(const EventListener* listener) {
ExtensionService::INCLUDE_ENABLED);
if (extension) {
scoped_ptr<ListValue> args(new ListValue());
- activity_log_->LogAPIAction(
- extension, event_name + ".removeListener", args.get(), std::string());
+ activity_log_->LogAPIAction(extension,
+ event_name + ".removeListener",
+ args.get(),
+ "");
}
}
@@ -380,7 +384,7 @@ bool EventRouter::HasEventListenerImpl(const ListenerMap& listener_map,
}
void EventRouter::BroadcastEvent(scoped_ptr<Event> event) {
- DispatchEventImpl(std::string(), linked_ptr<Event>(event.release()));
+ DispatchEventImpl("", linked_ptr<Event>(event.release()));
}
void EventRouter::DispatchEventToExtension(const std::string& extension_id,