| Index: ash/common/wm_shell.cc
|
| diff --git a/ash/common/wm/wm_globals.cc b/ash/common/wm_shell.cc
|
| similarity index 60%
|
| rename from ash/common/wm/wm_globals.cc
|
| rename to ash/common/wm_shell.cc
|
| index 5fb1a5f7039c5d8714b23c5fca617322b4582595..2161121c8fda5a8f5b2b6ad92e22b747eed071e3 100644
|
| --- a/ash/common/wm/wm_globals.cc
|
| +++ b/ash/common/wm_shell.cc
|
| @@ -2,23 +2,21 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/common/wm/wm_globals.h"
|
| +#include "ash/common/wm_shell.h"
|
|
|
| namespace ash {
|
| -namespace wm {
|
|
|
| // static
|
| -WmGlobals* WmGlobals::instance_ = nullptr;
|
| +WmShell* WmShell::instance_ = nullptr;
|
|
|
| // static
|
| -void WmGlobals::Set(WmGlobals* instance) {
|
| +void WmShell::Set(WmShell* instance) {
|
| instance_ = instance;
|
| }
|
|
|
| // static
|
| -WmGlobals* WmGlobals::Get() {
|
| +WmShell* WmShell::Get() {
|
| return instance_;
|
| }
|
|
|
| -} // namespace wm
|
| } // namespace ash
|
|
|