Merge 184467 "Instant: Don't commit unless the page supports Ins..."

chrome/browser/instant/instant_loader.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/instant/instant_loader.h"
 
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/browser/page_navigator.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "ipc/ipc_message.h"
 
 namespace {
 
 int kUserDataKey;
 
 class InstantLoaderUserData : public base::SupportsUserData::Data {
  public:
@@ skipping 126 matching lines @@
   MaybeCommitFromPointerRelease();
 }
 
 bool InstantLoader::WebContentsDelegateImpl::OnGoToEntryOffset(int offset) {
   return false;
 }
 
 content::WebContents* InstantLoader::WebContentsDelegateImpl::OpenURLFromTab(
     content::WebContents* source,
     const content::OpenURLParams& params) {
+  if (!loader_->supports_instant_) {
+    // If the page doesn't yet support Instant, it hasn't fully loaded.
+    // This is a redirect that we should allow. http://crbug.com/177948
+    content::NavigationController::LoadURLParams load_params(params.url);
+    load_params.transition_type = params.transition;
+    load_params.referrer = params.referrer;
+    load_params.extra_headers = params.extra_headers;
+    load_params.is_renderer_initiated = params.is_renderer_initiated;
+    load_params.transferred_global_request_id =
+        params.transferred_global_request_id;
+    load_params.is_cross_site_redirect = params.is_cross_site_redirect;
+
+    loader_->contents_->GetController().LoadURLWithParams(load_params);
+    return loader_->contents_.get();
+  }
+
   content::WebContents* preview = loader_->contents_.get();
   if (loader_->controller_->CommitIfPossible(INSTANT_COMMIT_NAVIGATED))
     return preview->GetDelegate()->OpenURLFromTab(source, params);
   return NULL;
 }
 
 void InstantLoader::WebContentsDelegateImpl::MaybeCommitFromPointerRelease() {
   if (loader_->is_pointer_down_from_activate_) {
     loader_->is_pointer_down_from_activate_ = false;
     loader_->controller_->CommitIfPossible(INSTANT_COMMIT_FOCUS_LOST);
@@ skipping 139 matching lines @@
 void InstantLoader::StopCapturingKeyStrokes() {
   InstantSupportDetermined(true);
   controller_->StopCapturingKeyStrokes();
 }
 
 void InstantLoader::RenderViewGone() {
   controller_->InstantLoaderRenderViewGone();
 }
 
 void InstantLoader::AboutToNavigateMainFrame(const GURL& url) {
+  if (!supports_instant_)
+    return;
   controller_->InstantLoaderAboutToNavigateMainFrame(url);
 }
 
 void InstantLoader::NavigateToURL(const GURL& url,
                                   content::PageTransition transition) {
   InstantSupportDetermined(true);
   controller_->NavigateToURL(url, transition);
 }
 
 void InstantLoader::Observe(int type,
@@ skipping 91 matching lines @@
                                            content::WebContents* new_contents) {
   DCHECK_EQ(old_contents, contents());
   CleanupPreviewContents();
   // We release here without deleting so that the caller still has the
   // responsibility for deleting the WebContents.
   ignore_result(contents_.release());
   contents_.reset(new_contents);
   SetupPreviewContents();
   controller_->SwappedWebContents();
 }