| 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/common/wm/wm_globals.h" | 5 #include "ash/common/wm_shell.h" |
| 6 | 6 |
| 7 namespace ash { | 7 namespace ash { |
| 8 namespace wm { | |
| 9 | 8 |
| 10 // static | 9 // static |
| 11 WmGlobals* WmGlobals::instance_ = nullptr; | 10 WmShell* WmShell::instance_ = nullptr; |
| 12 | 11 |
| 13 // static | 12 // static |
| 14 void WmGlobals::Set(WmGlobals* instance) { | 13 void WmShell::Set(WmShell* instance) { |
| 15 instance_ = instance; | 14 instance_ = instance; |
| 16 } | 15 } |
| 17 | 16 |
| 18 // static | 17 // static |
| 19 WmGlobals* WmGlobals::Get() { | 18 WmShell* WmShell::Get() { |
| 20 return instance_; | 19 return instance_; |
| 21 } | 20 } |
| 22 | 21 |
| 23 } // namespace wm | |
| 24 } // namespace ash | 22 } // namespace ash |
| OLD | NEW |