| 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 #include "ash/wm/window_state_aura.h" | 5 #include "ash/wm/window_state_aura.h" |
| 6 | 6 |
| 7 #include "ash/aura/wm_window_aura.h" | |
| 8 #include "ash/common/wm/window_state.h" | 7 #include "ash/common/wm/window_state.h" |
| 8 #include "ash/common/wm_window.h" |
| 9 #include "ash/wm/window_properties.h" | 9 #include "ash/wm/window_properties.h" |
| 10 #include "ash/wm/window_util.h" | 10 #include "ash/wm/window_util.h" |
| 11 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
| 12 | 12 |
| 13 namespace ash { | 13 namespace ash { |
| 14 namespace wm { | 14 namespace wm { |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 // This classes is used so that the WindowState constructor can be made | 17 // This classes is used so that the WindowState constructor can be made |
| 18 // protected. GetWindowState() is the only place that should be creating | 18 // protected. GetWindowState() is the only place that should be creating |
| (...skipping 12 matching lines...) Expand all Loading... |
| 31 WindowState* GetActiveWindowState() { | 31 WindowState* GetActiveWindowState() { |
| 32 aura::Window* active = GetActiveWindow(); | 32 aura::Window* active = GetActiveWindow(); |
| 33 return active ? GetWindowState(active) : nullptr; | 33 return active ? GetWindowState(active) : nullptr; |
| 34 } | 34 } |
| 35 | 35 |
| 36 WindowState* GetWindowState(aura::Window* window) { | 36 WindowState* GetWindowState(aura::Window* window) { |
| 37 if (!window) | 37 if (!window) |
| 38 return nullptr; | 38 return nullptr; |
| 39 WindowState* settings = window->GetProperty(kWindowStateKey); | 39 WindowState* settings = window->GetProperty(kWindowStateKey); |
| 40 if (!settings) { | 40 if (!settings) { |
| 41 settings = new WindowStateAura(WmWindowAura::Get(window)); | 41 settings = new WindowStateAura(WmWindow::Get(window)); |
| 42 window->SetProperty(kWindowStateKey, settings); | 42 window->SetProperty(kWindowStateKey, settings); |
| 43 } | 43 } |
| 44 return settings; | 44 return settings; |
| 45 } | 45 } |
| 46 | 46 |
| 47 const WindowState* GetWindowState(const aura::Window* window) { | 47 const WindowState* GetWindowState(const aura::Window* window) { |
| 48 return GetWindowState(const_cast<aura::Window*>(window)); | 48 return GetWindowState(const_cast<aura::Window*>(window)); |
| 49 } | 49 } |
| 50 | 50 |
| 51 } // namespace wm | 51 } // namespace wm |
| 52 } // namespace ash | 52 } // namespace ash |
| OLD | NEW |