Final batch adding real histogram values for extension events.

chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc

 // Copyright (c) 2012 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.
 
 // Implements the Chrome Extensions WebNavigation API.
 
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h"
 
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 21 matching lines @@
 
 namespace {
 
 // Returns |time| as milliseconds since the epoch.
 double MilliSecondsFromTime(const base::Time& time) {
   return 1000 * time.ToDoubleT();
 }
 
 // Dispatches events to the extension message service.
 void DispatchEvent(content::BrowserContext* browser_context,
+                   events::HistogramValue histogram_value,
                    const std::string& event_name,
                    scoped_ptr<base::ListValue> args,
                    const GURL& url) {
   EventFilteringInfo info;
   info.SetURL(url);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   EventRouter* event_router = EventRouter::Get(profile);
   if (profile && event_router) {
     scoped_ptr<Event> event(
-        new Event(events::UNKNOWN, event_name, args.Pass()));
+        new Event(histogram_value, event_name, args.Pass()));
     event->restrict_to_browser_context = profile;
     event->filter_info = info;
     event_router->BroadcastEvent(event.Pass());
   }
 }
 
 }  // namespace
 
 int GetFrameId(content::RenderFrameHost* frame_host) {
   if (!frame_host)
@@ skipping 13 matching lines @@
   dict->SetInteger(keys::kTabIdKey, ExtensionTabUtil::GetTabId(web_contents));
   dict->SetString(keys::kUrlKey, validated_url.spec());
   dict->SetInteger(keys::kProcessIdKey, frame_host->GetProcess()->GetID());
   dict->SetInteger(keys::kFrameIdKey, GetFrameId(frame_host));
   dict->SetInteger(keys::kParentFrameIdKey,
                    GetFrameId(frame_host->GetParent()));
   dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
   args->Append(dict);
 
   DispatchEvent(web_contents->GetBrowserContext(),
-                web_navigation::OnBeforeNavigate::kEventName,
-                args.Pass(),
+                events::WEB_NAVIGATION_ON_BEFORE_NAVIGATE,
+                web_navigation::OnBeforeNavigate::kEventName, args.Pass(),
                 validated_url);
 }
 
 // Constructs and dispatches an onCommitted or onReferenceFragmentUpdated
 // event.
-void DispatchOnCommitted(const std::string& event_name,
+void DispatchOnCommitted(events::HistogramValue histogram_value,
+                         const std::string& event_name,
                          content::WebContents* web_contents,
                          content::RenderFrameHost* frame_host,
                          const GURL& url,
                          ui::PageTransition transition_type) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
   base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetInteger(keys::kTabIdKey, ExtensionTabUtil::GetTabId(web_contents));
   dict->SetString(keys::kUrlKey, url.spec());
   dict->SetInteger(keys::kProcessIdKey, frame_host->GetProcess()->GetID());
   dict->SetInteger(keys::kFrameIdKey, GetFrameId(frame_host));
@@ skipping 11 matching lines @@
   if (transition_type & ui::PAGE_TRANSITION_SERVER_REDIRECT)
     qualifiers->Append(new base::StringValue("server_redirect"));
   if (transition_type & ui::PAGE_TRANSITION_FORWARD_BACK)
     qualifiers->Append(new base::StringValue("forward_back"));
   if (transition_type & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)
     qualifiers->Append(new base::StringValue("from_address_bar"));
   dict->Set(keys::kTransitionQualifiersKey, qualifiers);
   dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
   args->Append(dict);
 
-  DispatchEvent(web_contents->GetBrowserContext(), event_name, args.Pass(),
-                url);
+  DispatchEvent(web_contents->GetBrowserContext(), histogram_value, event_name,
+                args.Pass(), url);
 }
 
 // Constructs and dispatches an onDOMContentLoaded event.
 void DispatchOnDOMContentLoaded(content::WebContents* web_contents,
                                 content::RenderFrameHost* frame_host,
                                 const GURL& url) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
   base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetInteger(keys::kTabIdKey,
                    ExtensionTabUtil::GetTabId(web_contents));
   dict->SetString(keys::kUrlKey, url.spec());
   dict->SetInteger(keys::kProcessIdKey, frame_host->GetProcess()->GetID());
   dict->SetInteger(keys::kFrameIdKey, GetFrameId(frame_host));
   dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
   args->Append(dict);
 
   DispatchEvent(web_contents->GetBrowserContext(),
-                web_navigation::OnDOMContentLoaded::kEventName,
-                args.Pass(),
+                events::WEB_NAVIGATION_ON_DOM_CONTENT_LOADED,
+                web_navigation::OnDOMContentLoaded::kEventName, args.Pass(),
                 url);
 }
 
 // Constructs and dispatches an onCompleted event.
 void DispatchOnCompleted(content::WebContents* web_contents,
                          content::RenderFrameHost* frame_host,
                          const GURL& url) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
   base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetInteger(keys::kTabIdKey,
                    ExtensionTabUtil::GetTabId(web_contents));
   dict->SetString(keys::kUrlKey, url.spec());
   dict->SetInteger(keys::kProcessIdKey, frame_host->GetProcess()->GetID());
   dict->SetInteger(keys::kFrameIdKey, GetFrameId(frame_host));
   dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
   args->Append(dict);
 
   DispatchEvent(web_contents->GetBrowserContext(),
-                web_navigation::OnCompleted::kEventName,
-                args.Pass(), url);
+                events::WEB_NAVIGATION_ON_COMPLETED,
+                web_navigation::OnCompleted::kEventName, args.Pass(), url);
 }
 
 // Constructs and dispatches an onCreatedNavigationTarget event.
 void DispatchOnCreatedNavigationTarget(
     content::WebContents* web_contents,
     content::BrowserContext* browser_context,
     content::RenderFrameHost* source_frame_host,
     content::WebContents* target_web_contents,
     const GURL& target_url) {
   // Check that the tab is already inserted into a tab strip model. This code
@@ skipping 10 matching lines @@
   dict->SetInteger(keys::kSourceProcessIdKey,
                    source_frame_host->GetProcess()->GetID());
   dict->SetInteger(keys::kSourceFrameIdKey, GetFrameId(source_frame_host));
   dict->SetString(keys::kUrlKey, target_url.possibly_invalid_spec());
   dict->SetInteger(keys::kTabIdKey,
                    ExtensionTabUtil::GetTabId(target_web_contents));
   dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
   args->Append(dict);
 
   DispatchEvent(browser_context,
+                events::WEB_NAVIGATION_ON_CREATED_NAVIGATION_TARGET,
                 web_navigation::OnCreatedNavigationTarget::kEventName,
-                args.Pass(),
-                target_url);
+                args.Pass(), target_url);
 }
 
 // Constructs and dispatches an onErrorOccurred event.
 void DispatchOnErrorOccurred(content::WebContents* web_contents,
                              content::RenderFrameHost* frame_host,
                              const GURL& url,
                              int error_code) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
   base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetInteger(keys::kTabIdKey, ExtensionTabUtil::GetTabId(web_contents));
   dict->SetString(keys::kUrlKey, url.spec());
   dict->SetInteger(keys::kProcessIdKey, frame_host->GetProcess()->GetID());
   dict->SetInteger(keys::kFrameIdKey, GetFrameId(frame_host));
   dict->SetString(keys::kErrorKey, net::ErrorToString(error_code));
   dict->SetDouble(keys::kTimeStampKey,
       MilliSecondsFromTime(base::Time::Now()));
   args->Append(dict);
 
   DispatchEvent(web_contents->GetBrowserContext(),
-                web_navigation::OnErrorOccurred::kEventName,
-                args.Pass(), url);
+                events::WEB_NAVIGATION_ON_ERROR_OCCURRED,
+                web_navigation::OnErrorOccurred::kEventName, args.Pass(), url);
 }
 
 // Constructs and dispatches an onTabReplaced event.
 void DispatchOnTabReplaced(
     content::WebContents* old_web_contents,
     content::BrowserContext* browser_context,
     content::WebContents* new_web_contents) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
   base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetInteger(keys::kReplacedTabIdKey,
                    ExtensionTabUtil::GetTabId(old_web_contents));
   dict->SetInteger(
       keys::kTabIdKey,
       ExtensionTabUtil::GetTabId(new_web_contents));
   dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
   args->Append(dict);
 
-  DispatchEvent(browser_context,
-                web_navigation::OnTabReplaced::kEventName,
-                args.Pass(),
-                GURL());
+  DispatchEvent(browser_context, events::WEB_NAVIGATION_ON_TAB_REPLACED,
+                web_navigation::OnTabReplaced::kEventName, args.Pass(), GURL());
 }
 
 }  // namespace web_navigation_api_helpers
 
 }  // namespace extensions