| Index: ash/wm/common/wm_globals.cc
|
| diff --git a/ash/wm/common/shelf/wm_shelf_util.cc b/ash/wm/common/wm_globals.cc
|
| similarity index 50%
|
| copy from ash/wm/common/shelf/wm_shelf_util.cc
|
| copy to ash/wm/common/wm_globals.cc
|
| index 5133feb7600ddba33547cf43974d2ab5edcd4bc6..0e61bdca5ed13b5a08d01daa56c911b0a3175028 100644
|
| --- a/ash/wm/common/shelf/wm_shelf_util.cc
|
| +++ b/ash/wm/common/wm_globals.cc
|
| @@ -2,14 +2,22 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/wm/common/shelf/wm_shelf_util.h"
|
| +#include "ash/wm/common/wm_globals.h"
|
|
|
| namespace ash {
|
| namespace wm {
|
|
|
| -bool IsHorizontalAlignment(wm::ShelfAlignment alignment) {
|
| - return alignment == wm::SHELF_ALIGNMENT_BOTTOM ||
|
| - alignment == wm::SHELF_ALIGNMENT_BOTTOM_LOCKED;
|
| +// static
|
| +WmGlobals* WmGlobals::instance_ = nullptr;
|
| +
|
| +// static
|
| +void WmGlobals::Set(WmGlobals* instance) {
|
| + instance_ = instance;
|
| +}
|
| +
|
| +// static
|
| +WmGlobals* WmGlobals::Get() {
|
| + return instance_;
|
| }
|
|
|
| } // namespace wm
|
|
|