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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Fixing possible crash. 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
« no previous file with comments | « chrome/browser/instant/instant_loader.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 50450606f26c6f0484168043fb622d40f81a9cc1..4023c19829043fc3e1ed8f15ab2028fcefc22cc7 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -4387,10 +4387,17 @@ void Browser::OnStateChanged() {
void Browser::ShowInstant(TabContentsWrapper* preview_contents) {
DCHECK(instant_->tab_contents() == GetSelectedTabContentsWrapper());
window_->ShowInstant(preview_contents);
+
+ GetSelectedTabContents()->HideContents();
+ preview_contents->tab_contents()->ShowContents();
}
void Browser::HideInstant() {
window_->HideInstant();
+ if (GetSelectedTabContents())
+ GetSelectedTabContents()->ShowContents();
+ if (instant_->GetPreviewContents())
+ instant_->GetPreviewContents()->tab_contents()->HideContents();
}
void Browser::CommitInstant(TabContentsWrapper* preview_contents) {
« no previous file with comments | « chrome/browser/instant/instant_loader.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698