| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 public: | 43 public: |
| 44 WebContentsViewAura(WebContentsImpl* web_contents, | 44 WebContentsViewAura(WebContentsImpl* web_contents, |
| 45 WebContentsViewDelegate* delegate); | 45 WebContentsViewDelegate* delegate); |
| 46 | 46 |
| 47 void SetupOverlayWindowForTesting(); | 47 void SetupOverlayWindowForTesting(); |
| 48 | 48 |
| 49 void SetTouchEditableForTest(TouchEditableImplAura* touch_editable); | 49 void SetTouchEditableForTest(TouchEditableImplAura* touch_editable); |
| 50 | 50 |
| 51 private: | 51 private: |
| 52 class WindowObserver; | 52 class WindowObserver; |
| 53 #if defined(OS_WIN) | |
| 54 class ChildWindowObserver; | |
| 55 #endif | |
| 56 | 53 |
| 57 virtual ~WebContentsViewAura(); | 54 virtual ~WebContentsViewAura(); |
| 58 | 55 |
| 59 void SizeChangedCommon(const gfx::Size& size); | 56 void SizeChangedCommon(const gfx::Size& size); |
| 60 | 57 |
| 61 void EndDrag(WebKit::WebDragOperationsMask ops); | 58 void EndDrag(WebKit::WebDragOperationsMask ops); |
| 62 | 59 |
| 63 // Creates and sets up the overlay window that will be displayed during the | 60 // Creates and sets up the overlay window that will be displayed during the |
| 64 // overscroll gesture. | 61 // overscroll gesture. |
| 65 void PrepareOverscrollWindow(); | 62 void PrepareOverscrollWindow(); |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 virtual void OnDragExited() OVERRIDE; | 183 virtual void OnDragExited() OVERRIDE; |
| 187 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; | 184 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; |
| 188 | 185 |
| 189 scoped_ptr<aura::Window> window_; | 186 scoped_ptr<aura::Window> window_; |
| 190 | 187 |
| 191 // The window that shows the screenshot of the history page during an | 188 // The window that shows the screenshot of the history page during an |
| 192 // overscroll navigation gesture. | 189 // overscroll navigation gesture. |
| 193 scoped_ptr<aura::Window> overscroll_window_; | 190 scoped_ptr<aura::Window> overscroll_window_; |
| 194 | 191 |
| 195 scoped_ptr<WindowObserver> window_observer_; | 192 scoped_ptr<WindowObserver> window_observer_; |
| 196 #if defined(OS_WIN) | |
| 197 scoped_ptr<ChildWindowObserver> child_window_observer_; | |
| 198 #endif | |
| 199 | 193 |
| 200 // The WebContentsImpl whose contents we display. | 194 // The WebContentsImpl whose contents we display. |
| 201 WebContentsImpl* web_contents_; | 195 WebContentsImpl* web_contents_; |
| 202 | 196 |
| 203 scoped_ptr<WebContentsViewDelegate> delegate_; | 197 scoped_ptr<WebContentsViewDelegate> delegate_; |
| 204 | 198 |
| 205 WebKit::WebDragOperationsMask current_drag_op_; | 199 WebKit::WebDragOperationsMask current_drag_op_; |
| 206 | 200 |
| 207 scoped_ptr<DropData> current_drop_data_; | 201 scoped_ptr<DropData> current_drop_data_; |
| 208 | 202 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 230 scoped_ptr<ShadowLayerDelegate> overscroll_shadow_; | 224 scoped_ptr<ShadowLayerDelegate> overscroll_shadow_; |
| 231 | 225 |
| 232 scoped_ptr<TouchEditableImplAura> touch_editable_; | 226 scoped_ptr<TouchEditableImplAura> touch_editable_; |
| 233 | 227 |
| 234 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 228 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 235 }; | 229 }; |
| 236 | 230 |
| 237 } // namespace content | 231 } // namespace content |
| 238 | 232 |
| 239 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 233 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |