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

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_view.cc	(revision 69571)
+++ chrome/browser/ui/views/frame/browser_view.cc	(working copy)
@@ -1365,18 +1365,20 @@
   contents_->RemoveFade();
 }
 
-void BrowserView::HideInstant() {
-  if (!preview_container_) {
+void BrowserView::HideInstant(bool instant_is_active) {
+  if (instant_is_active)
+    contents_->ShowFade();
+  else
     contents_->RemoveFade();
+
+  if (!preview_container_)
     return;
-  }
 
   // The contents must be changed before SetPreview is invoked.
   preview_container_->ChangeTabContents(NULL);
   contents_->SetPreview(NULL, NULL);
   delete preview_container_;
   preview_container_ = NULL;
-  contents_->RemoveFade();
 }
 
 gfx::Rect BrowserView::GetInstantBounds() {