| Index: ash/mus/bridge/wm_lookup_mus.cc
|
| diff --git a/mash/wm/bridge/wm_lookup_mus.cc b/ash/mus/bridge/wm_lookup_mus.cc
|
| similarity index 52%
|
| rename from mash/wm/bridge/wm_lookup_mus.cc
|
| rename to ash/mus/bridge/wm_lookup_mus.cc
|
| index 2d7b55b05bed6124ee4944dfb782549529336601..6fcb63c5bc1e64a83cc869d6965a3ab24b1ebe98 100644
|
| --- a/mash/wm/bridge/wm_lookup_mus.cc
|
| +++ b/ash/mus/bridge/wm_lookup_mus.cc
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mash/wm/bridge/wm_lookup_mus.h"
|
| +#include "ash/mus/bridge/wm_lookup_mus.h"
|
|
|
| -#include "mash/wm/bridge/wm_globals_mus.h"
|
| -#include "mash/wm/bridge/wm_root_window_controller_mus.h"
|
| -#include "mash/wm/bridge/wm_window_mus.h"
|
| +#include "ash/mus/bridge/wm_globals_mus.h"
|
| +#include "ash/mus/bridge/wm_root_window_controller_mus.h"
|
| +#include "ash/mus/bridge/wm_window_mus.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| -namespace mash {
|
| -namespace wm {
|
| +namespace ash {
|
| +namespace mus {
|
|
|
| WmLookupMus::WmLookupMus() {
|
| WmLookup::Set(this);
|
| @@ -21,14 +21,14 @@ WmLookupMus::~WmLookupMus() {
|
| WmLookup::Set(nullptr);
|
| }
|
|
|
| -ash::wm::WmRootWindowController*
|
| -WmLookupMus::GetRootWindowControllerWithDisplayId(int64_t id) {
|
| +wm::WmRootWindowController* WmLookupMus::GetRootWindowControllerWithDisplayId(
|
| + int64_t id) {
|
| return WmGlobalsMus::Get()->GetRootWindowControllerWithDisplayId(id);
|
| }
|
|
|
| -ash::wm::WmWindow* WmLookupMus::GetWindowForWidget(views::Widget* widget) {
|
| +wm::WmWindow* WmLookupMus::GetWindowForWidget(views::Widget* widget) {
|
| return WmWindowMus::Get(widget);
|
| }
|
|
|
| -} // namespace wm
|
| -} // namespace mash
|
| +} // namespace mus
|
| +} // namespace ash
|
|
|