InstantExtended: Committed NTP

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/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_tab_contents.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 268 matching lines @@
   WebContents* ReleaseOwnership() {
     return target_contents_owner_.release();
   }
 
  private:
   chrome::NavigateParams* params_;
   scoped_ptr<WebContents> target_contents_owner_;
   DISALLOW_COPY_AND_ASSIGN(ScopedTargetContentsOwner);
 };
 
+content::WebContents* CreateTargetContents(const chrome::NavigateParams& params,
+                                           const GURL& url) {
+  WebContents::CreateParams create_params(
+      params.browser->profile(),
+      tab_util::GetSiteInstanceForNewTab(params.browser->profile(), url));
+  if (params.source_contents) {
+    create_params.initial_size =
+        params.source_contents->GetView()->GetContainerSize();
+  }
+#if defined(USE_AURA)
+  if (params.browser->window() &&
+      params.browser->window()->GetNativeWindow()) {
+    create_params.context =
+        params.browser->window()->GetNativeWindow();
+  }
+#endif
+
+  content::WebContents* target_contents = WebContents::Create(create_params);
+  // New tabs can have WebUI URLs that will make calls back to arbitrary
+  // tab helpers, so the entire set of tab helpers needs to be set up
+  // immediately.
+  BrowserNavigatorWebContentsAdoption::AttachTabHelpers(target_contents);
+  extensions::TabHelper::FromWebContents(target_contents)->
+      SetExtensionAppById(params.extension_app_id);
+  // TODO(sky): Figure out why this is needed. Without it we seem to get
+  // failures in startup tests.
+  // By default, content believes it is not hidden.  When adding contents
+  // in the background, tell it that it's hidden.
+  if ((params.tabstrip_add_types & TabStripModel::ADD_ACTIVE) == 0) {
+    // TabStripModel::AddWebContents invokes WasHidden if not foreground.
+    target_contents->WasHidden();
+  }
+  return target_contents;
+}
+
 // If a prerendered page exists for |url|, replace the page at |target_contents|
 // with it.
 bool SwapInPrerender(WebContents* target_contents, const GURL& url) {
   prerender::PrerenderManager* prerender_manager =
       prerender::PrerenderManagerFactory::GetForProfile(
           Profile::FromBrowserContext(target_contents->GetBrowserContext()));
   return prerender_manager &&
       prerender_manager->MaybeUsePrerenderedPage(target_contents, url);
 }
 
+bool SwapInInstantNTP(chrome::NavigateParams* params,
+                      const GURL& url,
+                      content::WebContents* source_contents) {
+  chrome::BrowserInstantController* instant =
+      params->browser->instant_controller();
+  return instant && instant->MaybeSwapInInstantNTPContents(
+      url, source_contents, &params->target_contents);
+}
+
 }  // namespace
 
 namespace chrome {
 
 NavigateParams::NavigateParams(Browser* a_browser,
                                const GURL& a_url,
                                content::PageTransition a_transition)
     : url(a_url),
       target_contents(NULL),
       source_contents(NULL),
@@ skipping 127 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 Instant's NTP contents?
+  bool swapped_in_instant = 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) {
-      WebContents::CreateParams create_params(
-          params->browser->profile(),
-          tab_util::GetSiteInstanceForNewTab(params->browser->profile(), url));
-      if (params->source_contents) {
-        create_params.initial_size =
-            params->source_contents->GetView()->GetContainerSize();
-      }
-#if defined(USE_AURA)
-      if (params->browser->window() &&
-          params->browser->window()->GetNativeWindow()) {
-        create_params.context =
-            params->browser->window()->GetNativeWindow();
-      }
-#endif
-      params->target_contents = WebContents::Create(create_params);
-      // New tabs can have WebUI URLs that will make calls back to arbitrary
-      // tab helpers, so the entire set of tab helpers needs to be set up
-      // immediately.
-      BrowserNavigatorWebContentsAdoption::AttachTabHelpers(
-          params->target_contents);
+      swapped_in_instant = SwapInInstantNTP(params, url, NULL);
+      if (!swapped_in_instant)
+        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();
-      extensions::TabHelper::FromWebContents(params->target_contents)->
-          SetExtensionAppById(params->extension_app_id);
-      // TODO(sky): Figure out why this is needed. Without it we seem to get
-      // failures in startup tests.
-      // By default, content believes it is not hidden.  When adding contents
-      // in the background, tell it that it's hidden.
-      if ((params->tabstrip_add_types & TabStripModel::ADD_ACTIVE) == 0) {
-        // TabStripModel::AddWebContents invokes WasHidden if not foreground.
-        params->target_contents->WasHidden();
-      }
     } else {
       // ... otherwise if we're loading in the current tab, the target is the
       // same as the source.
-      params->target_contents = params->source_contents;
+      DCHECK(params->source_contents);
+      swapped_in_instant = SwapInInstantNTP(params, url,
+                                            params->source_contents);
+      if (!swapped_in_instant)
+        params->target_contents = params->source_contents;
       DCHECK(params->target_contents);
     }
 
     if (user_initiated)
       params->target_contents->UserGestureDone();
 
-    if (SwapInPrerender(params->target_contents, url))
-      return;
+    if (!swapped_in_instant) {
+      if (SwapInPrerender(params->target_contents, url))
+        return;
 
-    // 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.
+      // 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);
+        LoadURLInContents(params->target_contents, url, params);
+      }
     }
   } else {
     // |target_contents| was specified non-NULL, and so we assume it has already
     // been navigated appropriately. We need to do nothing more other than
     // add it to the appropriate tabstrip.
   }
 
   // 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->Focus();
 
-  if (params->source_contents == params->target_contents) {
+  if (params->source_contents == params->target_contents ||
+      (swapped_in_instant && 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 53 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