| 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 #include <set> |
| 10 | 10 |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 | 130 |
| 131 // aura::EnvObserver: | 131 // aura::EnvObserver: |
| 132 void OnWindowInitialized(aura::Window* window) override; | 132 void OnWindowInitialized(aura::Window* window) override; |
| 133 void OnActiveFocusClientChanged(aura::client::FocusClient* focus_client, | 133 void OnActiveFocusClientChanged(aura::client::FocusClient* focus_client, |
| 134 aura::Window* window) override; | 134 aura::Window* window) override; |
| 135 | 135 |
| 136 internal::NativeWidgetDelegate* native_widget_delegate_; | 136 internal::NativeWidgetDelegate* native_widget_delegate_; |
| 137 | 137 |
| 138 DesktopNativeWidgetAura* desktop_native_widget_aura_; | 138 DesktopNativeWidgetAura* desktop_native_widget_aura_; |
| 139 | 139 |
| 140 // State to restore window to when exiting fullscreen. Only valid if | |
| 141 // fullscreen. | |
| 142 ui::WindowShowState fullscreen_restore_state_; | |
| 143 | |
| 144 // We can optionally have a parent which can order us to close, or own | 140 // We can optionally have a parent which can order us to close, or own |
| 145 // children who we're responsible for closing when we CloseNow(). | 141 // children who we're responsible for closing when we CloseNow(). |
| 146 DesktopWindowTreeHostMus* parent_ = nullptr; | 142 DesktopWindowTreeHostMus* parent_ = nullptr; |
| 147 std::set<DesktopWindowTreeHostMus*> children_; | 143 std::set<DesktopWindowTreeHostMus*> children_; |
| 148 | 144 |
| 149 bool is_active_ = false; | 145 bool is_active_ = false; |
| 150 | 146 |
| 151 std::unique_ptr<wm::CursorManager> cursor_manager_; | 147 std::unique_ptr<wm::CursorManager> cursor_manager_; |
| 152 | 148 |
| 153 bool auto_update_client_area_ = true; | 149 bool auto_update_client_area_ = true; |
| 154 | 150 |
| 155 // Used so that Close() isn't immediate. | 151 // Used so that Close() isn't immediate. |
| 156 base::WeakPtrFactory<DesktopWindowTreeHostMus> close_widget_factory_; | 152 base::WeakPtrFactory<DesktopWindowTreeHostMus> close_widget_factory_; |
| 157 | 153 |
| 158 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostMus); | 154 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostMus); |
| 159 }; | 155 }; |
| 160 | 156 |
| 161 } // namespace views | 157 } // namespace views |
| 162 | 158 |
| 163 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ | 159 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ |
| OLD | NEW |