diff options
12 files changed, 17 insertions, 16 deletions
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc index 5162892..1913ee4 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc @@ -163,7 +163,7 @@ void ExtensionBluetoothEventRouter::SetSendDiscoveryEvents(bool should_send) { } void ExtensionBluetoothEventRouter::DispatchDeviceEvent( - const char* event_name, const bluetooth::Device& device) { + const std::string& event_name, const bluetooth::Device& device) { scoped_ptr<base::ListValue> args(new base::ListValue()); args->Append(device.ToValue().release()); scoped_ptr<Event> event(new Event(event_name, args.Pass())); diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h index 2040869..a0ae71b 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h @@ -85,7 +85,7 @@ class ExtensionBluetoothEventRouter // Dispatch an event that takes a device as a parameter to all renderers. void DispatchDeviceEvent( - const char* event_name, + const std::string& event_name, const extensions::api::bluetooth::Device& device); // Dispatch an event that takes a connection socket as a parameter to the diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index f64299c..d3b3af5 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -155,7 +155,7 @@ BookmarkEventRouter::~BookmarkEventRouter() { } void BookmarkEventRouter::DispatchEvent( - const char* event_name, + const std::string& event_name, scoped_ptr<base::ListValue> event_args) { if (extensions::ExtensionSystem::Get(profile_)->event_router()) { extensions::ExtensionSystem::Get(profile_)->event_router()->BroadcastEvent( diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h index 638828a..4e7c978 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h @@ -60,7 +60,7 @@ class BookmarkEventRouter : public BookmarkModelObserver { private: // Helper to actually dispatch an event to extension listeners. - void DispatchEvent(const char* event_name, + void DispatchEvent(const std::string& event_name, scoped_ptr<base::ListValue> event_args); Profile* profile_; diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index 8a0e161..49155e5a 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -1832,7 +1832,7 @@ void ExtensionDownloadsEventRouter::OnDownloadRemoved( } void ExtensionDownloadsEventRouter::DispatchEvent( - const char* event_name, + const std::string& event_name, bool include_incognito, const extensions::Event::WillDispatchCallback& will_dispatch_callback, base::Value* arg) { diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/browser/extensions/api/downloads/downloads_api.h index fed2a8b..6c211bf 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.h +++ b/chrome/browser/extensions/api/downloads/downloads_api.h @@ -379,7 +379,7 @@ class ExtensionDownloadsEventRouter : public extensions::EventRouter::Observer, private: void DispatchEvent( - const char* event_name, + const std::string& event_name, bool include_incognito, const extensions::Event::WillDispatchCallback& will_dispatch_callback, base::Value* json_arg); diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc index 1b8b962..d6b08ca 100644 --- a/chrome/browser/extensions/api/history/history_api.cc +++ b/chrome/browser/extensions/api/history/history_api.cc @@ -193,7 +193,7 @@ void HistoryEventRouter::HistoryUrlsRemoved( void HistoryEventRouter::DispatchEvent( Profile* profile, - const char* event_name, + const std::string& event_name, scoped_ptr<base::ListValue> event_args) { if (profile && extensions::ExtensionSystem::Get(profile)->event_router()) { scoped_ptr<extensions::Event> event(new extensions::Event( diff --git a/chrome/browser/extensions/api/history/history_api.h b/chrome/browser/extensions/api/history/history_api.h index d57547a..619aed7 100644 --- a/chrome/browser/extensions/api/history/history_api.h +++ b/chrome/browser/extensions/api/history/history_api.h @@ -45,7 +45,7 @@ class HistoryEventRouter : public content::NotificationObserver { const history::URLsDeletedDetails* details); void DispatchEvent(Profile* profile, - const char* event_name, + const std::string& event_name, scoped_ptr<base::ListValue> event_args); // Used for tracking registrations to history service notifications. diff --git a/chrome/browser/extensions/api/processes/processes_api.cc b/chrome/browser/extensions/api/processes/processes_api.cc index c92b2db..d1032f6 100644 --- a/chrome/browser/extensions/api/processes/processes_api.cc +++ b/chrome/browser/extensions/api/processes/processes_api.cc @@ -342,7 +342,8 @@ void ProcessesEventRouter::OnItemsChanged(int start, int length) { for (int i = start; i < start + length; i++) { if (model_->IsResourceFirstInGroup(i)) { int id = model_->GetUniqueChildProcessId(i); - base::DictionaryValue* process = CreateProcessFromModel(id, model_, i, true); + base::DictionaryValue* process = CreateProcessFromModel(id, model_, i, + true); processes_map.AddWithID(process, i); } } @@ -466,7 +467,7 @@ void ProcessesEventRouter::ProcessClosedEvent( } void ProcessesEventRouter::DispatchEvent( - const char* event_name, + const std::string& event_name, scoped_ptr<base::ListValue> event_args) { if (extensions::ExtensionSystem::Get(profile_)->event_router()) { scoped_ptr<extensions::Event> event(new extensions::Event( diff --git a/chrome/browser/extensions/api/processes/processes_api.h b/chrome/browser/extensions/api/processes/processes_api.h index b1599af..21cabad 100644 --- a/chrome/browser/extensions/api/processes/processes_api.h +++ b/chrome/browser/extensions/api/processes/processes_api.h @@ -66,7 +66,7 @@ class ProcessesEventRouter : public TaskManagerModelObserver, content::RenderProcessHost* rph, content::RenderProcessHost::RendererClosedDetails* details); - void DispatchEvent(const char* event_name, + void DispatchEvent(const std::string& event_name, scoped_ptr<base::ListValue> event_args); // Determines whether there is a registered listener for the specified event. diff --git a/chrome/browser/extensions/api/tabs/tabs_event_router.cc b/chrome/browser/extensions/api/tabs/tabs_event_router.cc index a95944f..fd6160d 100644 --- a/chrome/browser/extensions/api/tabs/tabs_event_router.cc +++ b/chrome/browser/extensions/api/tabs/tabs_event_router.cc @@ -412,7 +412,7 @@ void TabsEventRouter::FaviconUrlUpdated(WebContents* contents) { void TabsEventRouter::DispatchEvent( Profile* profile, - const char* event_name, + const std::string& event_name, scoped_ptr<ListValue> args, EventRouter::UserGestureState user_gesture) { if (!profile_->IsSameProfile(profile) || @@ -426,7 +426,7 @@ void TabsEventRouter::DispatchEvent( } void TabsEventRouter::DispatchSimpleBrowserEvent( - Profile* profile, const int window_id, const char* event_name) { + Profile* profile, const int window_id, const std::string& event_name) { if (!profile_->IsSameProfile(profile)) return; diff --git a/chrome/browser/extensions/api/tabs/tabs_event_router.h b/chrome/browser/extensions/api/tabs/tabs_event_router.h index c6a843a..1c95f7a 100644 --- a/chrome/browser/extensions/api/tabs/tabs_event_router.h +++ b/chrome/browser/extensions/api/tabs/tabs_event_router.h @@ -85,19 +85,19 @@ class TabsEventRouter : public TabStripModelObserver, // The TabsEventRouter listens to events for all profiles, // so we avoid duplication by dropping events destined for other profiles. void DispatchEvent(Profile* profile, - const char* event_name, + const std::string& event_name, scoped_ptr<base::ListValue> args, EventRouter::UserGestureState user_gesture); void DispatchEventsAcrossIncognito( Profile* profile, - const char* event_name, + const std::string& event_name, scoped_ptr<base::ListValue> event_args, scoped_ptr<base::ListValue> cross_incognito_args); void DispatchSimpleBrowserEvent(Profile* profile, const int window_id, - const char* event_name); + const std::string& event_name); // Packages |changed_properties| as a tab updated event for the tab |contents| // and dispatches the event to the extension. |