| Index: chrome/browser/ui/gtk/browser_window_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
|
| index d120d84776afcb15492cf824f3b87bac6ba00e8b..63c6941a313648557abd722c87ff6545a43cf915 100644
|
| --- a/chrome/browser/ui/gtk/browser_window_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
|
| @@ -64,7 +64,7 @@
|
| #include "chrome/browser/ui/gtk/gtk_window_util.h"
|
| #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h"
|
| #include "chrome/browser/ui/gtk/infobars/infobar_gtk.h"
|
| -#include "chrome/browser/ui/gtk/instant_preview_controller_gtk.h"
|
| +#include "chrome/browser/ui/gtk/instant_overlay_controller_gtk.h"
|
| #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
|
| #include "chrome/browser/ui/gtk/nine_box.h"
|
| #include "chrome/browser/ui/gtk/one_click_signin_bubble_gtk.h"
|
| @@ -1664,8 +1664,8 @@ void BrowserWindowGtk::InitWidgets() {
|
| gtk_box_pack_end(GTK_BOX(window_vbox_), render_area_event_box_,
|
| TRUE, TRUE, 0);
|
|
|
| - instant_preview_controller_.reset(
|
| - new InstantPreviewControllerGtk(this, contents_container_.get()));
|
| + instant_overlay_controller_.reset(
|
| + new InstantOverlayControllerGtk(this, contents_container_.get()));
|
|
|
| if (IsBookmarkBarSupported()) {
|
| bookmark_bar_.reset(new BookmarkBarGtk(this,
|
| @@ -1909,7 +1909,7 @@ void BrowserWindowGtk::MaybeShowBookmarkBar(bool animate) {
|
| bookmark_bar_->SetPageNavigator(browser_.get());
|
|
|
| BookmarkBar::State state = browser_->bookmark_bar_state();
|
| - if (contents_container_->HasPreview() && state == BookmarkBar::DETACHED)
|
| + if (contents_container_->HasOverlay() && state == BookmarkBar::DETACHED)
|
| state = BookmarkBar::HIDDEN;
|
|
|
| toolbar_->UpdateForBookmarkBarVisibility(state == BookmarkBar::DETACHED);
|
|
|