| Index: chrome/browser/ui/views/frame/browser_view.h
|
| diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
|
| index dedbba1beb985c239fc309cd6f1da1e31da9833f..c09214f77367af82c5f5cbad73069dd29354a0e0 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view.h
|
| +++ b/chrome/browser/ui/views/frame/browser_view.h
|
| @@ -47,7 +47,7 @@ class DownloadShelfView;
|
| class FullscreenExitBubbleViews;
|
| class ImmersiveModeController;
|
| class InfoBarContainerView;
|
| -class InstantPreviewControllerViews;
|
| +class InstantOverlayControllerViews;
|
| class LocationBarView;
|
| class StatusBubbleViews;
|
| class SearchViewController;
|
| @@ -619,7 +619,7 @@ class BrowserView : public BrowserWindow,
|
| // | | Page content (contents_) | |
|
| // | | +------------------------------------------------------+ | |
|
| // | | | contents_container_ and/or | | |
|
| - // | | | preview_controller_->preview_container_ | | |
|
| + // | | | overlay_controller_->overlay_container_ | | |
|
| // | | | | | |
|
| // | | | | | |
|
| // | | +------------------------------------------------------+ | |
|
| @@ -638,7 +638,7 @@ class BrowserView : public BrowserWindow,
|
| // [2] The bookmark bar and info bar are swapped when on the new tab page.
|
| // Additionally contents_ is positioned on top of the bookmark bar when
|
| // the bookmark bar is detached. This is done to allow the
|
| - // preview_controller_->preview_container_ to appear over the bookmark
|
| + // overlay_controller_->overlay_container_ to appear over the bookmark
|
| // bar.
|
|
|
| // Tool/Info bars that we are currently showing. Used for layout.
|
| @@ -673,7 +673,7 @@ class BrowserView : public BrowserWindow,
|
| views::WebView* devtools_container_;
|
|
|
| // The view managing both the contents_container_ and
|
| - // preview_controller_->preview_container_.
|
| + // overlay_controller_->overlay_container_.
|
| ContentsContainer* contents_;
|
|
|
| // Split view containing the contents container and devtools container.
|
| @@ -752,7 +752,7 @@ class BrowserView : public BrowserWindow,
|
|
|
| gfx::ScopedSysColorChangeListener color_change_listener_;
|
|
|
| - scoped_ptr<InstantPreviewControllerViews> preview_controller_;
|
| + scoped_ptr<InstantOverlayControllerViews> overlay_controller_;
|
|
|
| mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
|
|
|
|
|