| 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 <memory> | 8 #include <memory> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/gtest_prod_util.h" | 11 #include "base/gtest_prod_util.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
| 14 #include "content/browser/renderer_host/overscroll_controller_delegate.h" | 14 #include "content/browser/renderer_host/overscroll_controller_delegate.h" |
| 15 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 15 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
| 16 #include "content/browser/web_contents/web_contents_view.h" | 16 #include "content/browser/web_contents/web_contents_view.h" |
| 17 #include "content/common/content_export.h" | 17 #include "content/common/content_export.h" |
| 18 #include "ui/aura/client/drag_drop_delegate.h" |
| 18 #include "ui/aura/window_delegate.h" | 19 #include "ui/aura/window_delegate.h" |
| 19 #include "ui/aura/window_observer.h" | 20 #include "ui/aura/window_observer.h" |
| 20 #include "ui/wm/public/drag_drop_delegate.h" | |
| 21 | 21 |
| 22 namespace aura { | 22 namespace aura { |
| 23 class Window; | 23 class Window; |
| 24 } | 24 } |
| 25 | 25 |
| 26 namespace ui { | 26 namespace ui { |
| 27 class DropTargetEvent; | 27 class DropTargetEvent; |
| 28 class TouchSelectionController; | 28 class TouchSelectionController; |
| 29 } | 29 } |
| 30 | 30 |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 std::unique_ptr<GestureNavSimple> gesture_nav_simple_; | 213 std::unique_ptr<GestureNavSimple> gesture_nav_simple_; |
| 214 | 214 |
| 215 bool init_rwhv_with_null_parent_for_testing_; | 215 bool init_rwhv_with_null_parent_for_testing_; |
| 216 | 216 |
| 217 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 217 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 218 }; | 218 }; |
| 219 | 219 |
| 220 } // namespace content | 220 } // namespace content |
| 221 | 221 |
| 222 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 222 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |