InstantExtended: hook up InstantTab in incognito.

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 1573 matching lines @@
                                     GURL(instant_url)))
     return false;
 
   return page->supports_instant();
 }
 
 void InstantController::ResetNTP(const std::string& instant_url) {
   // Instant NTP is only used in extended mode so we should always have a
   // non-empty URL to use.
   DCHECK(!instant_url.empty());
-  ntp_.reset(new InstantNTP(this, instant_url));
+  ntp_.reset(new InstantNTP(this, instant_url,
+                            browser_->profile()->IsOffTheRecord()));
   ntp_->InitContents(profile(), browser_->GetActiveWebContents(),
                      base::Bind(&InstantController::ReloadStaleNTP,
                                 base::Unretained(this)));
   LOG_INSTANT_DEBUG_EVENT(this, base::StringPrintf(
       "ResetNTP: instant_url='%s'", instant_url.c_str()));
 }
 
 void InstantController::ReloadStaleNTP() {
   ResetNTP(GetInstantURL());
 }
@@ skipping 20 matching lines @@
   return !(InStartup() && chrome::ShouldPreferRemoteNTPOnStartup());
 }
 
 void InstantController::ResetOverlay(const std::string& instant_url) {
   HideInternal();
   // If there's no active tab, the browser is opening or closing.
   const content::WebContents* active_tab = browser_->GetActiveWebContents();
   if (!active_tab || instant_url.empty()) {
     overlay_.reset();
   } else {
-    overlay_.reset(new InstantOverlay(this, instant_url));
+    overlay_.reset(new InstantOverlay(this, instant_url,
+                                      browser_->profile()->IsOffTheRecord()));
     overlay_->InitContents(browser_->profile(), active_tab);
   }
   LOG_INSTANT_DEBUG_EVENT(this, base::StringPrintf(
       "ResetOverlay: instant_url='%s'", instant_url.c_str()));
 }
 
 InstantController::InstantFallbackReason
 InstantController::ShouldSwitchToLocalOverlay() const {
   if (!extended_enabled())
     return INSTANT_FALLBACK_NONE;
 
   if (!overlay())
     return DetermineFallbackReason(NULL, std::string());
 
   // Assume users with Javascript disabled do not want the online experience.
   if (!IsJavascriptEnabled())
     return INSTANT_FALLBACK_JAVASCRIPT_DISABLED;
 
   if (overlay()->IsLocal())
     return INSTANT_FALLBACK_NONE;
 
   bool page_is_current = PageIsCurrent(overlay());
   if (!page_is_current)
     return DetermineFallbackReason(overlay(), GetInstantURL());
 
   return INSTANT_FALLBACK_NONE;
 }
 
 void InstantController::ResetInstantTab() {
-  // Do not wire up the InstantTab in Incognito, to prevent it from sending data
-  // to the page.
-  if (!search_mode_.is_origin_default() &&
-      !browser_->profile()->IsOffTheRecord()) {
+  if (!search_mode_.is_origin_default()) {
     content::WebContents* active_tab = browser_->GetActiveWebContents();
     if (!instant_tab_ || active_tab != instant_tab_->contents()) {
-      instant_tab_.reset(new InstantTab(this));
+      instant_tab_.reset(
+          new InstantTab(this, browser_->profile()->IsOffTheRecord()));
       instant_tab_->Init(active_tab);
       UpdateInfoForInstantTab();
       use_tab_for_suggestions_ = true;
     }
 
     // Hide the |overlay_| since we are now using |instant_tab_| instead.
     HideOverlay();
   } else {
     instant_tab_.reset();
   }
@@ skipping 229 matching lines @@
   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();
 }