Change visibility semantics for Instant.

chrome/browser/ui/browser_instant_controller.cc

 // Copyright (c) 2012 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_instant_controller.h"
 
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_unload_handler.h"
@@ skipping 60 matching lines @@
   // to handle them. If you hit this NOTREACHED file a bug and I'll (sky) add
   // support for the new disposition.
   NOTREACHED();
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserInstantController, InstantControllerDelegate implementation:
 
 void BrowserInstantController::ShowInstant(int height, InstantSizeUnits units) {
-  // Call ShowInstant() first, before WasShown(), so that the preview is added
-  // to the window hierarchy before it's painted. http://crbug.com/145568
-  TabContents* preview = instant_->GetPreviewContents();
-  browser_->window()->ShowInstant(preview, height, units);
-
-  // TODO(beng): Investigate if we can avoid this and instead rely on the
-  //             visibility of the WebContentsView.
-  preview->web_contents()->WasShown();
-  chrome::GetActiveWebContents(browser_)->WasHidden();
+  browser_->window()->ShowInstant(instant_->GetPreviewContents(),
+                                  height, units);
 }
 
 void BrowserInstantController::HideInstant() {
   browser_->window()->HideInstant();
-
-  if (chrome::GetActiveWebContents(browser_))
-    chrome::GetActiveWebContents(browser_)->WasShown();
-  if (TabContents* preview = instant_->GetPreviewContents())
-    preview->web_contents()->WasHidden();
 }
 
 void BrowserInstantController::CommitInstant(TabContents* preview) {
   TabContents* active_tab = chrome::GetActiveTabContents(browser_);
   int index = browser_->tab_strip_model()->GetIndexOfTabContents(active_tab);
   DCHECK_NE(TabStripModel::kNoTab, index);
   // TabStripModel takes ownership of |preview|.
   browser_->tab_strip_model()->ReplaceTabContentsAt(index, preview);
   // InstantUnloadHandler takes ownership of |active_tab|.
   instant_unload_handler_->RunUnloadListenersOrDestroy(active_tab, index);
@@ skipping 54 matching lines @@
 void BrowserInstantController::ResetInstant() {
   instant_.reset(
       !browser_shutdown::ShuttingDownWithoutClosingBrowsers() &&
       browser_->is_type_tabbed() ?
           InstantController::CreateInstant(browser_->profile(), this) : NULL);
   instant_unload_handler_.reset(instant() ?
       new InstantUnloadHandler(browser_) : NULL);
 }
 
 }  // namespace chrome