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

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

Issue 8373010: Fixing visibility transitions for Instant. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Minor style fix. Created 9 years, 2 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.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 09a522d1bf3291e57d8ae6d9fb2f7e7d74746c0f..87f6953097a1d6c5accfa06906a5e15f63055369 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -4311,10 +4311,16 @@ void Browser::OnStateChanged() {
void Browser::ShowInstant(TabContentsWrapper* preview_contents) {
DCHECK(instant_->tab_contents() == GetSelectedTabContentsWrapper());
window_->ShowInstant(preview_contents);
+
+ instant_->tab_contents()->tab_contents()->HideContents();
sreeram 2011/10/25 23:26:48 Why not just: GetSelectedTabContents()->HideConten
Shishir 2011/10/25 23:46:26 Done.
+ preview_contents->tab_contents()->ShowContents();
}
void Browser::HideInstant() {
window_->HideInstant();
+ instant_->tab_contents()->tab_contents()->ShowContents();
sreeram 2011/10/25 23:26:48 Same as before, why not just use GetSelectedTabCon
Shishir 2011/10/25 23:46:26 Done.
+ if (instant_->GetPreviewContents())
+ instant_->GetPreviewContents()->tab_contents()->HideContents();
}
void Browser::CommitInstant(TabContentsWrapper* preview_contents) {
« chrome/browser/instant/instant_browsertest.cc ('K') | « chrome/browser/instant/instant_loader.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698