Merge 69201 - Fixes bug in instant that resulted in flickery fade. The proble...

chrome/browser/ui/browser_window.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_UI_BROWSER_WINDOW_H_
 #define CHROME_BROWSER_UI_BROWSER_WINDOW_H_
 #pragma once
 
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/content_settings_types.h"
@@ skipping 305 matching lines @@
   virtual void OpenTabpose() = 0;
 #endif
 
   // See InstantDelegate for details.
   virtual void PrepareForInstant() = 0;
 
   // Invoked when instant's tab contents should be shown.
   virtual void ShowInstant(TabContents* preview_contents) = 0;
 
   // Invoked when the instant's tab contents should be hidden.
-  virtual void HideInstant() = 0;
+  // |instant_is_active| indicates if instant is still active.
+  virtual void HideInstant(bool instant_is_active) = 0;
 
   // Returns the desired bounds for instant in screen coordinates. Note that if
   // instant isn't currently visible this returns the bounds instant would be
   // placed at.
   virtual gfx::Rect GetInstantBounds() = 0;
 
   // Construct a BrowserWindow implementation for the specified |browser|.
   static BrowserWindow* CreateBrowserWindow(Browser* browser);
 
   // Construct a FindBar implementation for the specified |browser|.
@@ skipping 35 matching lines @@
 
   // Returns the ToolbarView.
   virtual ToolbarView* GetToolbarView() const = 0;
 #endif
 
  protected:
   virtual ~BrowserWindowTesting() {}
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_WINDOW_H_