| Index: content/browser/web_contents/web_contents_view_aura.h
|
| diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h
|
| index 46c76c67471c0387b84e72d65435c70b22087df5..83dd4ef603abedb15b8562748de948c8511b894e 100644
|
| --- a/content/browser/web_contents/web_contents_view_aura.h
|
| +++ b/content/browser/web_contents/web_contents_view_aura.h
|
| @@ -27,6 +27,7 @@ class DropTargetEvent;
|
|
|
| namespace content {
|
| class OverscrollNavigationOverlay;
|
| +class ShadowWindow;
|
| class WebContentsViewDelegate;
|
| class WebContentsImpl;
|
| class WebDragDestDelegate;
|
| @@ -172,6 +173,9 @@ class CONTENT_EXPORT WebContentsViewAura
|
| virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
|
|
|
| scoped_ptr<aura::Window> window_;
|
| +
|
| + // The window that shows the screenshot of the history page during an
|
| + // overscroll navigation gesture.
|
| scoped_ptr<aura::Window> overscroll_window_;
|
|
|
| scoped_ptr<WindowObserver> window_observer_;
|
| @@ -193,6 +197,10 @@ class CONTENT_EXPORT WebContentsViewAura
|
| // pointers.
|
| void* current_rvh_for_drag_;
|
|
|
| + // The container for the content-window. The doc for ShadowWindow explains its
|
| + // lifetime and ownership.
|
| + ShadowWindow* content_container_;
|
| +
|
| bool overscroll_change_brightness_;
|
|
|
| // The overscroll gesture currently in progress.
|
|
|