Log NTP hovers in 1993 clients

chrome/browser/ui/search/instant_controller.cc

 // Copyright 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/search/instant_controller.h"
 
 #include <iterator>
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 1021 matching lines @@
     ResetInstantTab();
 }
 
 void InstantController::TabDeactivated(content::WebContents* contents) {
   LOG_INSTANT_DEBUG_EVENT(this, "TabDeactivated");
   if (extended_enabled() && !contents->IsBeingDestroyed())
     CommitIfPossible(INSTANT_COMMIT_FOCUS_LOST);
 
   if (GetOverlayContents())
     HideOverlay();
+
+  // If user is deactivating an NTP tab, log the number of mouseovers for this
+  // NTP session.
+  if (ntp_ && (chrome::MatchesOriginAndPath(

[Jered, 2013/06/28 16:24:17]

Instead, say
if (chrome::IsInstantNTP(contents))

[annark1, 2013/06/28 18:38:22]

Done.

+                   GURL(GetInstantURL()), contents->GetURL()) ||
+               chrome::MatchesOriginAndPath(
+                   GURL(GetLocalInstantURL()), contents->GetURL()))) {
+    ntp_->LogTotalMouseovers(contents);

[Jered, 2013/06/28 16:24:17]

ntp_ is a preloaded new tab page, not the one that has just been deactivated.
This method should be static, so this call would just be
InstantNTP::LogTotalMouseovers(contents);

[annark1, 2013/06/28 18:38:22]

Done.

+  }
 }
 
 void InstantController::SetInstantEnabled(bool instant_enabled,
                                           bool use_local_page_only) {
   LOG_INSTANT_DEBUG_EVENT(this, base::StringPrintf(
       "SetInstantEnabled: instant_enabled=%d, use_local_page_only=%d",
       instant_enabled, use_local_page_only));
 
   // Non extended mode does not care about |use_local_page_only|.
   if (instant_enabled == instant_enabled_ &&
@@ skipping 820 matching lines @@
   result->relevance = match.relevance;
   result->autocomplete_match_index = autocomplete_match_index;
 
   DVLOG(1) << "    " << result->relevance << " "
       << UTF8ToUTF16(AutocompleteMatchType::ToString(result->type)) << " "
       << result->provider << " " << result->destination_url << " '"
       << result->description << "' '" << result->search_query << "' "
       << result->transition <<  " " << result->autocomplete_match_index;
 }
 
+void InstantController::LogIframeHover() {

[Jered, 2013/06/28 16:24:17]

Omit this method on InstantController. Handle this entirely from InstantPage.

[annark1, 2013/06/28 18:38:22]

Done.

+  if (!browser_ || !browser_->GetActiveWebContents() || !ntp_)
+    return;
+
+  ntp_->LogIframeHover(browser_->GetActiveWebContents());
+}
+
 bool InstantController::IsJavascriptEnabled() const {
   GURL instant_url(GetInstantURL());
   GURL origin(instant_url.GetOrigin());
   ContentSetting js_setting = profile()->GetHostContentSettingsMap()->
       GetContentSetting(origin, origin, CONTENT_SETTINGS_TYPE_JAVASCRIPT,
                         NO_RESOURCE_IDENTIFIER);
   // Javascript can be disabled either in content settings or via a WebKit
   // preference, so check both. Disabling it through the Settings page affects
   // content settings. I'm not sure how to disable the WebKit preference, but
   // it's theoretically possible some users have it off.
   bool js_content_enabled =
       js_setting == CONTENT_SETTING_DEFAULT ||
       js_setting == CONTENT_SETTING_ALLOW;
   bool js_webkit_enabled = profile()->GetPrefs()->GetBoolean(
       prefs::kWebKitJavascriptEnabled);
   return js_content_enabled && js_webkit_enabled;
 }
 
 bool InstantController::InStartup() const {
   // TODO(shishir): This is not completely reliable. Find a better way to detect
   // startup time.
   return !browser_->GetActiveWebContents();
 }
 
 InstantService* InstantController::GetInstantService() const {
   return InstantServiceFactory::GetForProfile(profile());
 }