| 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 28 matching lines...) Expand all Loading... |
| 39 : public WebContentsView, | 39 : public WebContentsView, |
| 40 public RenderViewHostDelegateView, | 40 public RenderViewHostDelegateView, |
| 41 public OverscrollControllerDelegate, | 41 public OverscrollControllerDelegate, |
| 42 public ui::ImplicitAnimationObserver, | 42 public ui::ImplicitAnimationObserver, |
| 43 public aura::WindowDelegate, | 43 public aura::WindowDelegate, |
| 44 public aura::client::DragDropDelegate { | 44 public aura::client::DragDropDelegate { |
| 45 public: | 45 public: |
| 46 WebContentsViewAura(WebContentsImpl* web_contents, | 46 WebContentsViewAura(WebContentsImpl* web_contents, |
| 47 WebContentsViewDelegate* delegate); | 47 WebContentsViewDelegate* delegate); |
| 48 | 48 |
| 49 CONTENT_EXPORT void SetupOverlayWindowForTesting(); | |
| 50 | |
| 51 CONTENT_EXPORT void SetTouchEditableForTest( | 49 CONTENT_EXPORT void SetTouchEditableForTest( |
| 52 TouchEditableImplAura* touch_editable); | 50 TouchEditableImplAura* touch_editable); |
| 53 | 51 |
| 54 private: | 52 private: |
| 55 class WindowObserver; | 53 class WindowObserver; |
| 56 | 54 |
| 57 virtual ~WebContentsViewAura(); | 55 virtual ~WebContentsViewAura(); |
| 58 | 56 |
| 59 void SizeChangedCommon(const gfx::Size& size); | 57 void SizeChangedCommon(const gfx::Size& size); |
| 60 | 58 |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 | 216 |
| 219 scoped_ptr<TouchEditableImplAura> touch_editable_; | 217 scoped_ptr<TouchEditableImplAura> touch_editable_; |
| 220 scoped_ptr<GestureNavSimple> gesture_nav_simple_; | 218 scoped_ptr<GestureNavSimple> gesture_nav_simple_; |
| 221 | 219 |
| 222 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 220 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 223 }; | 221 }; |
| 224 | 222 |
| 225 } // namespace content | 223 } // namespace content |
| 226 | 224 |
| 227 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 225 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |