| 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/aura/wm_root_window_controller_aura.h" | 5 #include "ash/wm/aura/wm_root_window_controller_aura.h" |
| 6 | 6 |
| 7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/wm/aura/wm_globals_aura.h" |
| 8 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
| 9 #include "ui/aura/window_property.h" | 10 #include "ui/aura/window_property.h" |
| 10 | 11 |
| 11 DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WmRootWindowControllerAura*); | 12 DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WmRootWindowControllerAura*); |
| 12 | 13 |
| 13 namespace ash { | 14 namespace ash { |
| 14 namespace wm { | 15 namespace wm { |
| 15 | 16 |
| 16 // TODO(sky): it likely makes more sense to hang this off RootWindowSettings. | 17 // TODO(sky): it likely makes more sense to hang this off RootWindowSettings. |
| 17 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::wm::WmRootWindowControllerAura, | 18 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::wm::WmRootWindowControllerAura, |
| (...skipping 27 matching lines...) Expand all Loading... |
| 45 return wm_root_window_controller; | 46 return wm_root_window_controller; |
| 46 | 47 |
| 47 // WmRootWindowControllerAura is owned by the RootWindowController's window. | 48 // WmRootWindowControllerAura is owned by the RootWindowController's window. |
| 48 return new WmRootWindowControllerAura(root_window_controller); | 49 return new WmRootWindowControllerAura(root_window_controller); |
| 49 } | 50 } |
| 50 | 51 |
| 51 bool WmRootWindowControllerAura::HasShelf() { | 52 bool WmRootWindowControllerAura::HasShelf() { |
| 52 return root_window_controller_->shelf() != nullptr; | 53 return root_window_controller_->shelf() != nullptr; |
| 53 } | 54 } |
| 54 | 55 |
| 56 WmGlobals* WmRootWindowControllerAura::GetGlobals() { |
| 57 return WmGlobalsAura::Get(); |
| 58 } |
| 59 |
| 55 } // namespace wm | 60 } // namespace wm |
| 56 } // namespace ash | 61 } // namespace ash |
| OLD | NEW |