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