Final batch adding real histogram values for extension events.

extensions/browser/api/system_info/system_info_api.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/api/system_info/system_info_api.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 55 matching lines @@
                                uint32_t metrics) override;
 
   // RemovableStorageObserver implementation.
   void OnRemovableStorageAttached(
       const storage_monitor::StorageInfo& info) override;
   void OnRemovableStorageDetached(
       const storage_monitor::StorageInfo& info) override;
 
   // Called from any thread to dispatch the systemInfo event to all extension
   // processes cross multiple profiles.
-  void DispatchEvent(const std::string& event_name,
+  void DispatchEvent(events::HistogramValue histogram_value,
+                     const std::string& event_name,
                      scoped_ptr<base::ListValue> args);
 
   // Called to dispatch the systemInfo.display.onDisplayChanged event.
   void OnDisplayChanged();
 
   // Used to record the event names being watched.
   std::multiset<std::string> watching_event_set_;
 
   bool has_storage_monitor_observer_;
 
@@ skipping 70 matching lines @@
     }
   }
 }
 
 void SystemInfoEventRouter::OnRemovableStorageAttached(
     const storage_monitor::StorageInfo& info) {
   StorageUnitInfo unit;
   systeminfo::BuildStorageUnitInfo(info, &unit);
   scoped_ptr<base::ListValue> args(new base::ListValue);
   args->Append(unit.ToValue().release());
-  DispatchEvent(system_storage::OnAttached::kEventName, args.Pass());
+  DispatchEvent(events::SYSTEM_STORAGE_ON_ATTACHED,
+                system_storage::OnAttached::kEventName, args.Pass());
 }
 
 void SystemInfoEventRouter::OnRemovableStorageDetached(
     const storage_monitor::StorageInfo& info) {
   scoped_ptr<base::ListValue> args(new base::ListValue);
   std::string transient_id =
       StorageMonitor::GetInstance()->GetTransientIdForDeviceId(
           info.device_id());
   args->AppendString(transient_id);
 
-  DispatchEvent(system_storage::OnDetached::kEventName, args.Pass());
+  DispatchEvent(events::SYSTEM_STORAGE_ON_DETACHED,
+                system_storage::OnDetached::kEventName, args.Pass());
 }
 
 void SystemInfoEventRouter::OnDisplayAdded(const gfx::Display& new_display) {
   OnDisplayChanged();
 }
 
 void SystemInfoEventRouter::OnDisplayRemoved(const gfx::Display& old_display) {
   OnDisplayChanged();
 }
 
 void SystemInfoEventRouter::OnDisplayMetricsChanged(const gfx::Display& display,
                                                     uint32_t metrics) {
   OnDisplayChanged();
 }
 
 void SystemInfoEventRouter::OnDisplayChanged() {
   scoped_ptr<base::ListValue> args(new base::ListValue());
-  DispatchEvent(system_display::OnDisplayChanged::kEventName, args.Pass());
+  DispatchEvent(events::SYSTEM_DISPLAY_ON_DISPLAY_CHANGED,
+                system_display::OnDisplayChanged::kEventName, args.Pass());
 }
 
-void SystemInfoEventRouter::DispatchEvent(const std::string& event_name,
-                                          scoped_ptr<base::ListValue> args) {
-  ExtensionsBrowserClient::Get()->BroadcastEventToRenderers(event_name,
-                                                            args.Pass());
+void SystemInfoEventRouter::DispatchEvent(
+    events::HistogramValue histogram_value,
+    const std::string& event_name,
+    scoped_ptr<base::ListValue> args) {
+  ExtensionsBrowserClient::Get()->BroadcastEventToRenderers(
+      histogram_value, event_name, args.Pass());
 }
 
 void AddEventListener(const std::string& event_name) {
   SystemInfoEventRouter::GetInstance()->AddEventListener(event_name);
 }
 
 void RemoveEventListener(const std::string& event_name) {
   SystemInfoEventRouter::GetInstance()->RemoveEventListener(event_name);
 }
 
@@ skipping 35 matching lines @@
 void SystemInfoAPI::OnListenerRemoved(const EventListenerInfo& details) {
   if (IsSystemStorageEvent(details.event_name)) {
     StorageMonitor::GetInstance()->EnsureInitialized(
         base::Bind(&RemoveEventListener, details.event_name));
   } else {
     RemoveEventListener(details.event_name);
   }
 }
 
 }  // namespace extensions