Merge 68816 - Fixes bug where we would show an instant preview when we though...

chrome/browser/instant/instant_loader.cc

 // Copyright (c) 2010 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 <algorithm>
 #include <utility>
 
 #include "app/l10n_util.h"
@@ skipping 539 matching lines @@
       // really have the search params, but we need to use the replace
       // functionality so that embeded tags (like {google:baseURL}) are escaped
       // correctly.
       // TODO(sky): having to use a replaceable url is a bit of a hack here.
       GURL instant_url(
           template_url->instant_url()->ReplaceSearchTerms(
               *template_url, std::wstring(), -1, std::wstring()));
       CommandLine* cl = CommandLine::ForCurrentProcess();
       if (cl->HasSwitch(switches::kInstantURL))
         instant_url = GURL(cl->GetSwitchValueASCII(switches::kInstantURL));
-      initial_instant_url_ = url;
       preview_contents_->controller().LoadURL(
           instant_url, GURL(), transition_type);
       frame_load_observer_.reset(
           new FrameLoadObserver(preview_contents()->tab_contents(),
                                 user_text_, verbatim));
     }
   } else {
     DCHECK(template_url_id_ == 0);
     frame_load_observer_.reset(NULL);
     preview_contents_->controller().LoadURL(url_, GURL(), transition_type);
@@ skipping 69 matching lines @@
 }
 
 bool InstantLoader::ShouldCommitInstantOnMouseUp() {
   return delegate_->ShouldCommitInstantOnMouseUp();
 }
 
 void InstantLoader::CommitInstantLoader() {
   delegate_->CommitInstantLoader(this);
 }
 
-void InstantLoader::ClearTemplateURLID() {
-  // This should only be invoked for sites we thought supported instant.
-  DCHECK(template_url_id_);
-
-  // The frame load observer should have completed.
-  DCHECK(!frame_load_observer_.get());
-
-  // We shouldn't be ready.
-  DCHECK(!ready());
-
-  template_url_id_ = 0;
-  ShowPreview();
-}
-
 void InstantLoader::SetCompleteSuggestedText(
     const string16& complete_suggested_text) {
   ShowPreview();
 
   if (complete_suggested_text == complete_suggested_text_)
     return;
 
   if (verbatim_) {
     // Don't show suggest results for verbatim queries.
     return;
@@ skipping 78 matching lines @@
   // the above operations. In a future UI, these may be removed or adjusted.
   DCHECK_EQ(0, intersection.y());
   DCHECK_LE(0, intersection.x());
   DCHECK_LE(0, intersection.width());
   DCHECK_LE(0, intersection.height());
 
   return intersection;
 }
 
 void InstantLoader::PageDoesntSupportInstant(bool needs_reload) {
-  GURL url_to_load = url_;
-
-  // Because we didn't process any of the requests to load in Update we're
-  // actually at initial_instant_url_. We need to reset url_ so that callers see
-  // the correct state.
-  url_ = initial_instant_url_;
-
   frame_load_observer_.reset(NULL);
 
-  delegate_->InstantLoaderDoesntSupportInstant(this, needs_reload, url_to_load);
+  delegate_->InstantLoaderDoesntSupportInstant(this);
 }
 
 void InstantLoader::ProcessBoundsChange() {
   if (last_omnibox_bounds_ == omnibox_bounds_)
     return;
 
   last_omnibox_bounds_ = omnibox_bounds_;
   if (preview_contents_.get() && is_showing_instant() &&
       !is_waiting_for_load()) {
     preview_contents_->render_view_host()->SearchBoxResize(
@@ skipping 34 matching lines @@
       Source<NavigationController>(&preview_contents_->controller()));
 #endif
 
   registrar_.Add(
       this,
       NotificationType::NAV_ENTRY_COMMITTED,
       Source<NavigationController>(&preview_contents_->controller()));
 
   preview_contents_->tab_contents()->ShowContents();
 }