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 "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "components/mus/public/interfaces/window_manager.mojom.h" | 9 #include "components/mus/public/interfaces/window_manager.mojom.h" |
10 #include "ui/aura/window_delegate.h" | 10 #include "ui/aura/window_delegate.h" |
11 #include "ui/platform_window/platform_window_delegate.h" | 11 #include "ui/platform_window/platform_window_delegate.h" |
12 #include "ui/views/widget/native_widget_private.h" | 12 #include "ui/views/widget/native_widget_private.h" |
13 | 13 |
14 namespace aura { | 14 namespace aura { |
15 namespace client { | 15 namespace client { |
16 class DefaultCaptureClient; | 16 class DefaultCaptureClient; |
| 17 class WindowTreeClient; |
17 } | 18 } |
18 class Window; | 19 class Window; |
19 } | 20 } |
20 | 21 |
21 namespace mojo { | 22 namespace mojo { |
22 class Shell; | 23 class Shell; |
23 } | 24 } |
24 | 25 |
25 namespace mus { | 26 namespace mus { |
26 class Window; | 27 class Window; |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 internal::NativeWidgetDelegate* native_widget_delegate_; | 186 internal::NativeWidgetDelegate* native_widget_delegate_; |
186 | 187 |
187 const mus::mojom::SurfaceType surface_type_; | 188 const mus::mojom::SurfaceType surface_type_; |
188 ui::PlatformWindowState show_state_before_fullscreen_; | 189 ui::PlatformWindowState show_state_before_fullscreen_; |
189 | 190 |
190 // Aura configuration. | 191 // Aura configuration. |
191 scoped_ptr<WindowTreeHostMus> window_tree_host_; | 192 scoped_ptr<WindowTreeHostMus> window_tree_host_; |
192 aura::Window* content_; | 193 aura::Window* content_; |
193 scoped_ptr<wm::FocusController> focus_client_; | 194 scoped_ptr<wm::FocusController> focus_client_; |
194 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; | 195 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |
| 196 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_; |
195 | 197 |
196 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); | 198 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); |
197 }; | 199 }; |
198 | 200 |
199 } // namespace views | 201 } // namespace views |
200 | 202 |
201 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ | 203 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ |
OLD | NEW |