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

chrome/browser/ui/views/frame/browser_view.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/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 1347 matching lines @@
 #if defined(OS_WIN)
   // Removing the fade is instant (on windows). We need to force the preview to
   // draw, otherwise the current page flickers before the new page appears.
   RedrawWindow(preview_contents->view()->GetContentNativeView(), NULL, NULL,
                RDW_INVALIDATE | RDW_UPDATENOW | RDW_NOCHILDREN);
 #endif
 
   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() {
   return contents_->GetPreviewBounds();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, BrowserWindowTesting implementation:
 
 BookmarkBarView* BrowserView::GetBookmarkBarView() const {
@@ skipping 1108 matching lines @@
       SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
 
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }