| Index: ash/mus/bridge/wm_lookup_mus.h
|
| diff --git a/mash/wm/bridge/wm_lookup_mus.h b/ash/mus/bridge/wm_lookup_mus.h
|
| similarity index 50%
|
| rename from mash/wm/bridge/wm_lookup_mus.h
|
| rename to ash/mus/bridge/wm_lookup_mus.h
|
| index e1b20906d8ee5e41e4b177cf4ce59083d43988ba..dbf4ed896b0e14eba432480da680ebc8da4103df 100644
|
| --- a/mash/wm/bridge/wm_lookup_mus.h
|
| +++ b/ash/mus/bridge/wm_lookup_mus.h
|
| @@ -2,33 +2,33 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MASH_WM_BRIDGE_WM_LOOKUP_MUS_H_
|
| -#define MASH_WM_BRIDGE_WM_LOOKUP_MUS_H_
|
| +#ifndef ASH_MUS_BRIDGE_WM_LOOKUP_MUS_H_
|
| +#define ASH_MUS_BRIDGE_WM_LOOKUP_MUS_H_
|
|
|
| #include <stdint.h>
|
|
|
| #include "ash/common/wm/wm_lookup.h"
|
| #include "base/macros.h"
|
|
|
| -namespace mash {
|
| -namespace wm {
|
| +namespace ash {
|
| +namespace mus {
|
|
|
| // WmLookup implementation for mus.
|
| -class WmLookupMus : public ash::wm::WmLookup {
|
| +class WmLookupMus : public wm::WmLookup {
|
| public:
|
| WmLookupMus();
|
| ~WmLookupMus() override;
|
|
|
| - // ash::wm::WmLookup:
|
| - ash::wm::WmRootWindowController* GetRootWindowControllerWithDisplayId(
|
| + // wm::WmLookup:
|
| + wm::WmRootWindowController* GetRootWindowControllerWithDisplayId(
|
| int64_t id) override;
|
| - ash::wm::WmWindow* GetWindowForWidget(views::Widget* widget) override;
|
| + wm::WmWindow* GetWindowForWidget(views::Widget* widget) override;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(WmLookupMus);
|
| };
|
|
|
| -} // namespace wm
|
| -} // namespace mash
|
| +} // namespace mus
|
| +} // namespace ash
|
|
|
| -#endif // MASH_WM_BRIDGE_WM_LOOKUP_MUS_H_
|
| +#endif // ASH_MUS_BRIDGE_WM_LOOKUP_MUS_H_
|
|
|