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

chrome/browser/instant/instant_loader_delegate.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_LOADER_DELEGATE_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_LOADER_DELEGATE_H_
 #pragma once
 
 #include "base/string16.h"
 
@@ skipping 18 matching lines @@
   // Returns the bounds of instant.
   virtual gfx::Rect GetInstantBounds() = 0;
 
   // Returns true if instant should be committed on mouse up.
   virtual bool ShouldCommitInstantOnMouseUp() = 0;
 
   // Invoked when the the loader should be committed.
   virtual void CommitInstantLoader(InstantLoader* loader) = 0;
 
   // Invoked if the loader was created with the intention that the site supports
-  // instant, but it turned out the site doesn't support instant. If
-  // |needs_reload| is true, |Update| was invoked on the loader with a url that
-  // has changed since the initial url, and |url_to_load| is that url.
-  virtual void InstantLoaderDoesntSupportInstant(InstantLoader* loader,
-                                                 bool needs_reload,
-                                                 const GURL& url_to_load) = 0;
+  // instant, but it turned out the site doesn't support instant.
+  virtual void InstantLoaderDoesntSupportInstant(InstantLoader* loader) = 0;
 
   // Adds the specified url to the set of urls instant won't prefetch for.
   virtual void AddToBlacklist(InstantLoader* loader, const GURL& url) = 0;
 
  protected:
   virtual ~InstantLoaderDelegate() {}
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_LOADER_DELEGATE_H_