| 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..62fdb4776fe2f0fe5a958adb211a20168c35713d 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(true);
|
| }
|
|
|
| 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() {
|
|
|