| Index: chrome/browser/extensions/api/system_private/system_private_api.cc
|
| diff --git a/chrome/browser/extensions/api/system_private/system_private_api.cc b/chrome/browser/extensions/api/system_private/system_private_api.cc
|
| index 54048c15a660f8de208a1f516b8fc7cd0b7b9a43..d98ab2e0e500f43acda4e221fbd245d8e1a14dd8 100644
|
| --- a/chrome/browser/extensions/api/system_private/system_private_api.cc
|
| +++ b/chrome/browser/extensions/api/system_private/system_private_api.cc
|
| @@ -47,13 +47,16 @@ const char kUpdatingState[] = "Updating";
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| // Dispatches an extension event with |argument|
|
| -void DispatchEvent(const std::string& event_name, base::Value* argument) {
|
| +void DispatchEvent(extensions::events::HistogramValue histogram_value,
|
| + const std::string& event_name,
|
| + base::Value* argument) {
|
| 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());
|
| + g_browser_process->extension_event_router_forwarder()
|
| + ->BroadcastEventToRenderers(histogram_value, event_name, list_args.Pass(),
|
| + GURL());
|
| }
|
|
|
| } // namespace
|
| @@ -143,22 +146,26 @@ void DispatchVolumeChangedEvent(double volume, bool is_volume_muted) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetDouble(kVolumeKey, volume);
|
| dict->SetBoolean(kIsVolumeMutedKey, is_volume_muted);
|
| - DispatchEvent(system_private::OnVolumeChanged::kEventName, dict);
|
| + DispatchEvent(extensions::events::SYSTEM_PRIVATE_ON_VOLUME_CHANGED,
|
| + system_private::OnVolumeChanged::kEventName, dict);
|
| }
|
|
|
| void DispatchBrightnessChangedEvent(int brightness, bool user_initiated) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetInteger(kBrightnessKey, brightness);
|
| dict->SetBoolean(kUserInitiatedKey, user_initiated);
|
| - DispatchEvent(system_private::OnBrightnessChanged::kEventName, dict);
|
| + DispatchEvent(extensions::events::SYSTEM_PRIVATE_ON_BRIGHTNESS_CHANGED,
|
| + system_private::OnBrightnessChanged::kEventName, dict);
|
| }
|
|
|
| void DispatchScreenUnlockedEvent() {
|
| - DispatchEvent(system_private::OnScreenUnlocked::kEventName, NULL);
|
| + DispatchEvent(extensions::events::SYSTEM_PRIVATE_ON_SCREEN_UNLOCKED,
|
| + system_private::OnScreenUnlocked::kEventName, NULL);
|
| }
|
|
|
| void DispatchWokeUpEvent() {
|
| - DispatchEvent(system_private::OnWokeUp::kEventName, NULL);
|
| + DispatchEvent(extensions::events::SYSTEM_PRIVATE_ON_WOKE_UP,
|
| + system_private::OnWokeUp::kEventName, NULL);
|
| }
|
|
|
| } // namespace extensions
|
|
|