Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1749)

Unified Diff: chrome/browser/ui/browser_instant_controller.cc

Issue 10959049: Change visibility semantics for Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Enable a test Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser_instant_controller.cc
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc
index fd0c9b9b24cee09f1256d13c592bd63abcb74edf..376aaf1d921db34803c2b1b31a286c882ce8b114 100644
--- a/chrome/browser/ui/browser_instant_controller.cc
+++ b/chrome/browser/ui/browser_instant_controller.cc
@@ -78,24 +78,12 @@ bool BrowserInstantController::OpenInstant(WindowOpenDisposition disposition) {
// 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) {
« no previous file with comments | « chrome/browser/instant/instant_controller.cc ('k') | chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698