| 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 30 matching lines...) Expand all Loading... |
| 41 public RenderViewHostDelegateView, | 41 public RenderViewHostDelegateView, |
| 42 public OverscrollControllerDelegate, | 42 public OverscrollControllerDelegate, |
| 43 public ui::ImplicitAnimationObserver, | 43 public ui::ImplicitAnimationObserver, |
| 44 public aura::WindowDelegate, | 44 public aura::WindowDelegate, |
| 45 public aura::client::DragDropDelegate, | 45 public aura::client::DragDropDelegate, |
| 46 public aura::WindowObserver { | 46 public aura::WindowObserver { |
| 47 public: | 47 public: |
| 48 WebContentsViewAura(WebContentsImpl* web_contents, | 48 WebContentsViewAura(WebContentsImpl* web_contents, |
| 49 WebContentsViewDelegate* delegate); | 49 WebContentsViewDelegate* delegate); |
| 50 | 50 |
| 51 CONTENT_EXPORT void SetupOverlayWindowForTesting(); | |
| 52 | |
| 53 CONTENT_EXPORT void SetTouchEditableForTest( | 51 CONTENT_EXPORT void SetTouchEditableForTest( |
| 54 TouchEditableImplAura* touch_editable); | 52 TouchEditableImplAura* touch_editable); |
| 55 | 53 |
| 56 private: | 54 private: |
| 57 class WindowObserver; | 55 class WindowObserver; |
| 58 | 56 |
| 59 virtual ~WebContentsViewAura(); | 57 virtual ~WebContentsViewAura(); |
| 60 | 58 |
| 61 void SizeChangedCommon(const gfx::Size& size); | 59 void SizeChangedCommon(const gfx::Size& size); |
| 62 | 60 |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 | 224 |
| 227 scoped_ptr<TouchEditableImplAura> touch_editable_; | 225 scoped_ptr<TouchEditableImplAura> touch_editable_; |
| 228 scoped_ptr<GestureNavSimple> gesture_nav_simple_; | 226 scoped_ptr<GestureNavSimple> gesture_nav_simple_; |
| 229 | 227 |
| 230 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 228 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 231 }; | 229 }; |
| 232 | 230 |
| 233 } // namespace content | 231 } // namespace content |
| 234 | 232 |
| 235 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 233 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |