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_MUS_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ |
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
13 #include "components/mus/public/cpp/scoped_window_ptr.h" | |
14 #include "components/mus/public/cpp/window.h" | |
15 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 13 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
16 #include "content/browser/web_contents/web_contents_view.h" | 14 #include "content/browser/web_contents/web_contents_view.h" |
17 #include "content/common/content_export.h" | 15 #include "content/common/content_export.h" |
18 #include "content/common/drag_event_source_info.h" | 16 #include "content/common/drag_event_source_info.h" |
| 17 #include "services/ui/public/cpp/scoped_window_ptr.h" |
| 18 #include "services/ui/public/cpp/window.h" |
19 #include "ui/aura/window_delegate.h" | 19 #include "ui/aura/window_delegate.h" |
20 | 20 |
21 namespace content { | 21 namespace content { |
22 | 22 |
23 class WebContents; | 23 class WebContents; |
24 class WebContentsImpl; | 24 class WebContentsImpl; |
25 class WebContentsViewDelegate; | 25 class WebContentsViewDelegate; |
26 | 26 |
27 class WebContentsViewMus : public WebContentsView, | 27 class WebContentsViewMus : public WebContentsView, |
28 public RenderViewHostDelegateView, | 28 public RenderViewHostDelegateView, |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 std::unique_ptr<WebContentsViewDelegate> delegate_; | 110 std::unique_ptr<WebContentsViewDelegate> delegate_; |
111 std::unique_ptr<aura::Window> aura_window_; | 111 std::unique_ptr<aura::Window> aura_window_; |
112 std::unique_ptr<mus::ScopedWindowPtr> mus_window_; | 112 std::unique_ptr<mus::ScopedWindowPtr> mus_window_; |
113 | 113 |
114 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMus); | 114 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMus); |
115 }; | 115 }; |
116 | 116 |
117 } // namespace content | 117 } // namespace content |
118 | 118 |
119 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ | 119 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ |
OLD | NEW |