Revert 244407 "InstantExtended: remove dead code related to the ..."

trunk/src/chrome/browser/ui/browser_navigator.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/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 360 matching lines @@
       InstantSearchPrerenderer::GetForProfile(profile);
   if (prerenderer && prerenderer->UsePrerenderedPage(url, params))
     return true;
 
   prerender::PrerenderManager* prerender_manager =
       prerender::PrerenderManagerFactory::GetForProfile(profile);
   return prerender_manager &&
       prerender_manager->MaybeUsePrerenderedPage(url, params);
 }
 
+bool SwapInInstantNTP(chrome::NavigateParams* params,
+                      const GURL& url,
+                      content::WebContents* source_contents) {
+  BrowserInstantController* instant = params->browser->instant_controller();
+  return instant && instant->MaybeSwapInInstantNTPContents(
+      url, source_contents, &params->target_contents);
+}
+
 chrome::HostDesktopType GetHostDesktop(Browser* browser) {
   if (browser)
     return browser->host_desktop_type();
   return chrome::GetActiveDesktop();
 }
 
 }  // namespace
 
 namespace chrome {
 
@@ skipping 176 matching lines @@
       base_transition == content::PAGE_TRANSITION_TYPED ||
       base_transition == content::PAGE_TRANSITION_AUTO_BOOKMARK ||
       base_transition == content::PAGE_TRANSITION_GENERATED ||
       base_transition == content::PAGE_TRANSITION_AUTO_TOPLEVEL ||
       base_transition == content::PAGE_TRANSITION_RELOAD ||
       base_transition == content::PAGE_TRANSITION_KEYWORD;
 
   // Check if this is a singleton tab that already exists
   int singleton_index = chrome::GetIndexOfSingletonTab(params);
 
-  // Did we use a prerender?
-  bool swapped_in_prerender = false;
+  // Did we use Instant's NTP contents or a prerender?
+  bool swapped_in = false;
 
   // If no target WebContents was specified, we need to construct one if
   // we are supposed to target a new tab; unless it's a singleton that already
   // exists.
   if (!params->target_contents && singleton_index < 0) {
     GURL url;
     if (params->url.is_empty()) {
       url = params->browser->profile()->GetHomePage();
       params->transition = content::PageTransitionFromInt(
           params->transition | content::PAGE_TRANSITION_HOME_PAGE);
     } else {
       url = params->url;
     }
 
     if (params->disposition != CURRENT_TAB) {
-      params->target_contents = CreateTargetContents(*params, url);
+      swapped_in = SwapInInstantNTP(params, url, NULL);
+      if (!swapped_in)
+        params->target_contents = CreateTargetContents(*params, url);
 
       // This function takes ownership of |params->target_contents| until it
       // is added to a TabStripModel.
       target_contents_owner.TakeOwnership();
     } else {
       // ... otherwise if we're loading in the current tab, the target is the
       // same as the source.
       DCHECK(params->source_contents);
-      params->target_contents = params->source_contents;
+      swapped_in = SwapInInstantNTP(params, url, params->source_contents);
+      if (!swapped_in)
+        params->target_contents = params->source_contents;
       DCHECK(params->target_contents);
       // Prerender expects |params->target_contents| to be attached to a browser
       // window, so only call for CURRENT_TAB navigations. (Others are currently
       // unsupported because of session storage namespaces anyway.)
       // Notice that this includes middle-clicking, since middle clicking
       // translates into a chrome::Navigate call with no URL followed by a
       // CURRENT_TAB navigation.
       // TODO(tburkard): We can actually swap in in non-CURRENT_TAB cases, as
       // long as the WebContents we swap into is part of a TabStrip model.
       // Therefore, we should swap in regardless of CURRENT_TAB, and instead,
       // check in the swapin function whether the WebContents is not in a
       // TabStrip model, in which case we must not swap in.
-      swapped_in_prerender = SwapInPrerender(url, params);
+      if (!swapped_in)
+        swapped_in = SwapInPrerender(url, params);
     }
 
     if (user_initiated)
       params->target_contents->UserGestureDone();
 
-    if (!swapped_in_prerender) {
+    if (!swapped_in) {
       // Try to handle non-navigational URLs that popup dialogs and such, these
       // should not actually navigate.
       if (!HandleNonNavigationAboutURL(url)) {
         // Perform the actual navigation, tracking whether it came from the
         // renderer.
 
         LoadURLInContents(params->target_contents, url, params);
         // For prerender bookkeeping purposes, record that this pending navigate
         // originated from chrome::Navigate.
         content::NavigationEntry* entry =
@@ skipping 12 matching lines @@
   // If the user navigated from the omnibox, and the selected tab is going to
   // lose focus, then make sure the focus for the source tab goes away from the
   // omnibox.
   if (params->source_contents &&
       (params->disposition == NEW_FOREGROUND_TAB ||
        params->disposition == NEW_WINDOW) &&
       (params->tabstrip_add_types & TabStripModel::ADD_INHERIT_OPENER))
     params->source_contents->GetView()->Focus();
 
   if (params->source_contents == params->target_contents ||
-      (swapped_in_prerender && params->disposition == CURRENT_TAB)) {
+      (swapped_in && params->disposition == CURRENT_TAB)) {
     // The navigation occurred in the source tab.
     params->browser->UpdateUIForNavigationInTab(params->target_contents,
                                                 params->transition,
                                                 user_initiated);
   } else if (singleton_index == -1) {
     // If some non-default value is set for the index, we should tell the
     // TabStripModel to respect it.
     if (params->tabstrip_index != -1)
       params->tabstrip_add_types |= TabStripModel::ADD_FORCE_INDEX;
 
@@ skipping 83 matching lines @@
   bool reverse_on_redirect = false;
   content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &rewritten_url, browser_context, &reverse_on_redirect);
 
   // Some URLs are mapped to uber subpages. Do not allow them in incognito.
   return !(rewritten_url.scheme() == chrome::kChromeUIScheme &&
            rewritten_url.host() == chrome::kChromeUIUberHost);
 }
 
 }  // namespace chrome