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

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 5701008: Fixes bug in instant that resulted in flickery fade. The problem would (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome
Patch Set: Adds content to 403.html as bots seem to have problem with empty file Created 10 years 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/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/views/frame/contents_container.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index b970b16346b74522bc061e458f3476e3779e39ab..769b59f1e40668e6878bb56fd6842f7ca1282bdd 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1369,18 +1369,20 @@ void BrowserView::ShowInstant(TabContents* preview_contents) {
contents_->RemoveFade();
}
-void BrowserView::HideInstant() {
- if (!preview_container_) {
+void BrowserView::HideInstant(bool instant_is_active) {
+ if (instant_is_active)
+ contents_->ShowFade();
+ else
contents_->RemoveFade();
+
+ if (!preview_container_)
return;
- }
// The contents must be changed before SetPreview is invoked.
preview_container_->ChangeTabContents(NULL);
contents_->SetPreview(NULL, NULL);
delete preview_container_;
preview_container_ = NULL;
- contents_->RemoveFade();
}
gfx::Rect BrowserView::GetInstantBounds() {
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/views/frame/contents_container.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698