OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ | 5 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ |
6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ | 6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 | 10 |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "components/mus/public/interfaces/window_manager.mojom.h" | 12 #include "components/mus/public/interfaces/window_manager.mojom.h" |
13 #include "ui/aura/window_delegate.h" | 13 #include "ui/aura/window_delegate.h" |
14 #include "ui/platform_window/platform_window_delegate.h" | 14 #include "ui/platform_window/platform_window_delegate.h" |
15 #include "ui/views/widget/native_widget_private.h" | 15 #include "ui/views/widget/native_widget_private.h" |
16 | 16 |
17 namespace aura { | 17 namespace aura { |
18 namespace client { | 18 namespace client { |
19 class DefaultCaptureClient; | 19 class DefaultCaptureClient; |
| 20 class WindowTreeClient; |
20 } | 21 } |
21 class Window; | 22 class Window; |
22 } | 23 } |
23 | 24 |
24 namespace mojo { | 25 namespace mojo { |
25 class Shell; | 26 class Shell; |
26 } | 27 } |
27 | 28 |
28 namespace mus { | 29 namespace mus { |
29 class Window; | 30 class Window; |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 internal::NativeWidgetDelegate* native_widget_delegate_; | 193 internal::NativeWidgetDelegate* native_widget_delegate_; |
193 | 194 |
194 const mus::mojom::SurfaceType surface_type_; | 195 const mus::mojom::SurfaceType surface_type_; |
195 ui::PlatformWindowState show_state_before_fullscreen_; | 196 ui::PlatformWindowState show_state_before_fullscreen_; |
196 | 197 |
197 // Aura configuration. | 198 // Aura configuration. |
198 scoped_ptr<WindowTreeHostMus> window_tree_host_; | 199 scoped_ptr<WindowTreeHostMus> window_tree_host_; |
199 aura::Window* content_; | 200 aura::Window* content_; |
200 scoped_ptr<wm::FocusController> focus_client_; | 201 scoped_ptr<wm::FocusController> focus_client_; |
201 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; | 202 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |
| 203 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_; |
202 | 204 |
203 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); | 205 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); |
204 }; | 206 }; |
205 | 207 |
206 } // namespace views | 208 } // namespace views |
207 | 209 |
208 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ | 210 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ |
OLD | NEW |