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

chrome/browser/instant/instant_controller.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_controller.h"
 
 #include "build/build_config.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 353 matching lines @@
     CommitCurrentPreview(INSTANT_COMMIT_FOCUS_LOST);
   } else {
     // This can happen if the mouse was down, we swapped out the preview and
     // the mouse was released. Generally this shouldn't happen, but if it does
     // revert.
     DestroyPreviewContents();
   }
 }
 
 void InstantController::InstantLoaderDoesntSupportInstant(
-    InstantLoader* loader,
-    bool needs_reload,
-    const GURL& url_to_load) {
+    InstantLoader* loader) {
   DCHECK(!loader->ready());  // We better not be showing this loader.
   DCHECK(loader->template_url_id());
 
+  VLOG(1) << " provider does not support instant";
+
+  // Don't attempt to use instant for this search engine again.
   BlacklistFromInstant(loader->template_url_id());
 
   if (loader_manager_->active_loader() == loader) {
-    // The loader is active. Continue to use it, but make sure it isn't tied to
-    // to the search engine anymore. ClearTemplateURLID ends up showing the
-    // loader.
-    loader_manager_->RemoveLoaderFromInstant(loader);
-    loader->ClearTemplateURLID();
-
-    if (needs_reload) {
-      string16 suggested_text;
-      loader->Update(tab_contents_, 0, url_to_load, last_transition_type_,
-                     loader->user_text(), false, &suggested_text);
+    // The loader is active, shut down instant.
+    DestroyPreviewContents();
+  } else {
+    if (loader_manager_->current_loader() == loader && is_active_) {
+      // There is a pending loader and we're active. Hide the preview. When then
+      // pending loader finishes loading we'll notify the delegate to show.
+      DCHECK(loader_manager_->pending_loader());
+      is_active_ = false;
+      delegate_->HideInstant();
     }
-  } else {
     loader_manager_->DestroyLoader(loader);
-    loader = NULL;
   }
 }
 
 void InstantController::AddToBlacklist(InstantLoader* loader, const GURL& url) {
   std::string host = url.host();
   if (host.empty())
     return;
 
   if (!host_blacklist_)
     host_blacklist_ = new HostBlacklist;
@@ skipping 197 matching lines @@
       return "Predictive";
     case VERBATIM_TYPE:
       return "Verbatim";
     case PREDICTIVE_NO_AUTO_COMPLETE_TYPE:
       return "PredictiveNoAutoComplete";
     default:
       NOTREACHED();
       return std::string();
   }
 }