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

chrome/browser/instant/instant_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 #pragma once
 
 #include <set>
 #include <string>
@@ skipping 168 matching lines @@
   // (until the search provider loads, then both return true).
   bool MightSupportInstant();
 
   // InstantLoaderDelegate
   virtual void ShowInstantLoader(InstantLoader* loader);
   virtual void SetSuggestedTextFor(InstantLoader* loader,
                                    const string16& text);
   virtual gfx::Rect GetInstantBounds();
   virtual bool ShouldCommitInstantOnMouseUp();
   virtual void CommitInstantLoader(InstantLoader* loader);
-  virtual void InstantLoaderDoesntSupportInstant(InstantLoader* loader,
-                                                 bool needs_reload,
-                                                 const GURL& url_to_load);
+  virtual void InstantLoaderDoesntSupportInstant(InstantLoader* loader);
   virtual void AddToBlacklist(InstantLoader* loader, const GURL& url);
 
 
  private:
   typedef std::set<std::string> HostBlacklist;
 
   // Returns true if we should update immediately.
   bool ShouldUpdateNow(TemplateURLID instant_id, const GURL& url);
 
   // Schedules a delayed update to load the specified url.
@@ skipping 88 matching lines @@
   ScopedVector<InstantLoader> loaders_to_destroy_;
 
   // The set of hosts that we don't use instant with. This is shared across all
   // instances and only maintained for the current session.
   static HostBlacklist* host_blacklist_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_