[InstantExtended] Fixing how PageLoadSRP is emitted. Previously it was emitted only for Instant sea…

chrome/browser/ui/uma_browsing_activity_observer.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.
 
 #include "chrome/browser/ui/uma_browsing_activity_observer.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/search_engines/template_url_service.h"
+#include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/user_metrics.h"
 
 namespace chrome {
 namespace {
 
 UMABrowsingActivityObserver* g_instance = NULL;
 
 }  // namespace
 
 // static
 void UMABrowsingActivityObserver::Init() {
@@ skipping 13 matching lines @@
 UMABrowsingActivityObserver::~UMABrowsingActivityObserver() {
 }
 
 void UMABrowsingActivityObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     const content::LoadCommittedDetails& load =
         *content::Details<content::LoadCommittedDetails>(details).ptr();
+
+    content::NavigationController* controller =
+      content::Source<content::NavigationController>(source).ptr();
+    // Track whether the page loaded is a search results page (SRP). Track
+    // the non-SRP navigations as well so there is a control.
+    content::RecordAction(content::UserMetricsAction("NavEntryCommitted"));
+    if (TemplateURLServiceFactory::GetForProfile(
+            Profile::FromBrowserContext(controller->GetBrowserContext()))->
+                IsSearchResultsPageFromDefaultSearchProvider(

[Mark P, 2013/08/06 23:17:47]

indent four less
ditto line below (or actually you may be able to fit line below on this line
now)

[rpetterson, 2013/08/06 23:41:31]

I don't understand your comment. "load.entry->GetURL()" won't fit on the line
above and my understanding is 4 space indent to continue a line.

I've fixed the indentation for the RecordAction line which was off.

[Mark P, 2013/08/06 23:57:17]

You indent more if you're at a deeper level than before.  In this case, your
parens for close out the Profile:: line, which means the IsSearchResults
function applies to the results from the GetForProfile call.  It should be
indented relative to that.

[rpetterson, 2013/08/07 00:18:24]

Done. Sadly load.entry->GetURL() still doesn't fit with the braces and brackets.

+                    load.entry->GetURL())) {
+        content::RecordAction(
+            content::UserMetricsAction("NavEntryCommitted.SRP"));
+    }
+
     if (!load.is_navigation_to_different_page())
       return;  // Don't log for subframes or other trivial types.
 
     LogRenderProcessHostCount();
     LogBrowserTabCount();
   } else if (type == chrome::NOTIFICATION_APP_TERMINATING) {
     delete g_instance;
     g_instance = NULL;
   }
 }
@@ skipping 41 matching lines @@
   // Record how many windows are open, by type.
   UMA_HISTOGRAM_COUNTS_100("WindowManager.AppWindowCountPerLoad",
                            app_window_count);
   UMA_HISTOGRAM_COUNTS_100("WindowManager.PopUpWindowCountPerLoad",
                            popup_window_count);
   UMA_HISTOGRAM_COUNTS_100("WindowManager.TabbedWindowCountPerLoad",
                            tabbed_window_count);
 }
 
 }  // namespace chrome