| 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 ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_ | 5 #ifndef ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_ |
| 6 #define ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_ | 6 #define ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/common/shell_window_ids.h" | |
| 11 #include "ash/common/wm_window.h" | 10 #include "ash/common/wm_window.h" |
| 11 #include "ash/shared/shell_window_ids.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/observer_list.h" | 13 #include "base/observer_list.h" |
| 14 #include "services/ui/public/cpp/window_observer.h" | 14 #include "services/ui/public/cpp/window_observer.h" |
| 15 | 15 |
| 16 namespace views { | 16 namespace views { |
| 17 class Widget; | 17 class Widget; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace ash { | 20 namespace ash { |
| 21 | 21 |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 void OnWindowVisibilityChanging(ui::Window* window, bool visible) override; | 268 void OnWindowVisibilityChanging(ui::Window* window, bool visible) override; |
| 269 void OnWindowVisibilityChanged(ui::Window* window, bool visible) override; | 269 void OnWindowVisibilityChanged(ui::Window* window, bool visible) override; |
| 270 void OnTransientChildAdded(ui::Window* window, | 270 void OnTransientChildAdded(ui::Window* window, |
| 271 ui::Window* transient) override; | 271 ui::Window* transient) override; |
| 272 void OnTransientChildRemoved(ui::Window* window, | 272 void OnTransientChildRemoved(ui::Window* window, |
| 273 ui::Window* transient) override; | 273 ui::Window* transient) override; |
| 274 | 274 |
| 275 ui::Window* window_; | 275 ui::Window* window_; |
| 276 | 276 |
| 277 // The shell window id of this window. Shell window ids are defined in | 277 // The shell window id of this window. Shell window ids are defined in |
| 278 // ash/common/shell_window_ids.h. | 278 // ash/shared/shell_window_ids.h. |
| 279 int shell_window_id_ = kShellWindowId_Invalid; | 279 int shell_window_id_ = kShellWindowId_Invalid; |
| 280 | 280 |
| 281 std::unique_ptr<wm::WindowState> window_state_; | 281 std::unique_ptr<wm::WindowState> window_state_; |
| 282 | 282 |
| 283 views::Widget* widget_ = nullptr; | 283 views::Widget* widget_ = nullptr; |
| 284 | 284 |
| 285 WidgetCreationType widget_creation_type_ = WidgetCreationType::INTERNAL; | 285 WidgetCreationType widget_creation_type_ = WidgetCreationType::INTERNAL; |
| 286 | 286 |
| 287 base::ObserverList<WmWindowObserver> observers_; | 287 base::ObserverList<WmWindowObserver> observers_; |
| 288 | 288 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 310 | 310 |
| 311 bool locked_to_root_ = false; | 311 bool locked_to_root_ = false; |
| 312 | 312 |
| 313 DISALLOW_COPY_AND_ASSIGN(WmWindowMus); | 313 DISALLOW_COPY_AND_ASSIGN(WmWindowMus); |
| 314 }; | 314 }; |
| 315 | 315 |
| 316 } // namespace mus | 316 } // namespace mus |
| 317 } // namespace ash | 317 } // namespace ash |
| 318 | 318 |
| 319 #endif // ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_ | 319 #endif // ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_ |
| OLD | NEW |