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

Unified Diff: chrome/browser/gtk/browser_window_gtk.cc

Issue 5906001: Makes linux honor instant_is_active when instant temporarily hides. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « no previous file | chrome/browser/tab_contents/tab_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 183b0b27c82220cf8d6b433c15dd895d9916ffba..c089f8d775031d4d056a24dcddfbb2753ec3214f 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -1111,7 +1111,7 @@ void BrowserWindowGtk::Paste() {
void BrowserWindowGtk::PrepareForInstant() {
TabContents* contents = contents_container_->GetTabContents();
if (contents)
- contents->FadeForInstant();
+ contents->FadeForInstant(false);
Evan Stade 2010/12/15 20:50:26 true?
sky 2010/12/15 21:07:58 Good catch. I inverted the meaning of the boolean
}
void BrowserWindowGtk::ShowInstant(TabContents* preview_contents) {
@@ -1127,7 +1127,13 @@ void BrowserWindowGtk::HideInstant(bool instant_is_active) {
contents_container_->PopPreviewContents();
MaybeShowBookmarkBar(false);
- // TODO(sky): honor instant_is_active.
+ TabContents* contents = contents_container_->GetTabContents();
+ if (contents) {
+ if (instant_is_active)
+ contents->FadeForInstant(false);
+ else
+ contents->CancelInstantFade();
+ }
}
gfx::Rect BrowserWindowGtk::GetInstantBounds() {
« no previous file with comments | « no previous file | chrome/browser/tab_contents/tab_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698