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