| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ | 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ |
| 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ | 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> |
| 9 | 10 |
| 10 #include "base/macros.h" | 11 #include "base/macros.h" |
| 11 #include "ui/aura/mus/window_tree_host_mus.h" | 12 #include "ui/aura/mus/window_tree_host_mus.h" |
| 12 #include "ui/views/mus/mus_export.h" | 13 #include "ui/views/mus/mus_export.h" |
| 13 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" | 14 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" |
| 14 | 15 |
| 15 namespace views { | 16 namespace views { |
| 16 | 17 |
| 17 class VIEWS_MUS_EXPORT DesktopWindowTreeHostMus | 18 class VIEWS_MUS_EXPORT DesktopWindowTreeHostMus |
| 18 : public DesktopWindowTreeHost, | 19 : public DesktopWindowTreeHost, |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 void SizeConstraintsChanged() override; | 89 void SizeConstraintsChanged() override; |
| 89 | 90 |
| 90 internal::NativeWidgetDelegate* native_widget_delegate_; | 91 internal::NativeWidgetDelegate* native_widget_delegate_; |
| 91 | 92 |
| 92 DesktopNativeWidgetAura* desktop_native_widget_aura_; | 93 DesktopNativeWidgetAura* desktop_native_widget_aura_; |
| 93 | 94 |
| 94 // State to restore window to when exiting fullscreen. Only valid if | 95 // State to restore window to when exiting fullscreen. Only valid if |
| 95 // fullscreen. | 96 // fullscreen. |
| 96 ui::WindowShowState fullscreen_restore_state_; | 97 ui::WindowShowState fullscreen_restore_state_; |
| 97 | 98 |
| 99 // We can optionally have a parent which can order us to close, or own |
| 100 // children who we're responsible for closing when we CloseNow(). |
| 101 DesktopWindowTreeHostMus* parent_ = nullptr; |
| 102 std::set<DesktopWindowTreeHostMus*> children_; |
| 103 |
| 98 // Used so that Close() isn't immediate. | 104 // Used so that Close() isn't immediate. |
| 99 base::WeakPtrFactory<DesktopWindowTreeHostMus> close_widget_factory_; | 105 base::WeakPtrFactory<DesktopWindowTreeHostMus> close_widget_factory_; |
| 100 | 106 |
| 101 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostMus); | 107 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostMus); |
| 102 }; | 108 }; |
| 103 | 109 |
| 104 } // namespace views | 110 } // namespace views |
| 105 | 111 |
| 106 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ | 112 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ |
| OLD | NEW |