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

chrome/browser/ui/browser.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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 3358 matching lines @@
 void Browser::PrepareForInstant() {
   window_->PrepareForInstant();
 }
 
 void Browser::ShowInstant(TabContentsWrapper* preview_contents) {
   DCHECK(instant_->tab_contents() == GetSelectedTabContentsWrapper());
   window_->ShowInstant(preview_contents->tab_contents());
 }
 
 void Browser::HideInstant() {
-  window_->HideInstant();
+  window_->HideInstant(instant_->is_active());
 }
 
 void Browser::CommitInstant(TabContentsWrapper* preview_contents) {
   TabContentsWrapper* tab_contents = instant_->tab_contents();
   int index =
       tab_handler_->GetTabStripModel()->GetIndexOfTabContents(tab_contents);
   DCHECK_NE(TabStripModel::kNoTab, index);
   preview_contents->controller().CopyStateFromAndPrune(
       &tab_contents->controller());
   // TabStripModel takes ownership of preview_contents.
@@ skipping 764 matching lines @@
   return false;
 }
 
 void Browser::CreateInstantIfNecessary() {
   if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) &&
       !profile()->IsOffTheRecord()) {
     instant_.reset(new InstantController(profile_, this));
     instant_unload_handler_.reset(new InstantUnloadHandler(this));
   }
 }