| Index: ash/sysui/container_delegate_mus.cc
|
| diff --git a/ash/sysui/container_delegate_mus.cc b/ash/sysui/container_delegate_mus.cc
|
| index b3a34ea67a59e99e45379f6e3ab2c3bd2245f35a..31c1825165a96a830b195f2708ebb580378043db 100644
|
| --- a/ash/sysui/container_delegate_mus.cc
|
| +++ b/ash/sysui/container_delegate_mus.cc
|
| @@ -6,29 +6,27 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include "ash/public/interfaces/container.mojom.h"
|
| #include "components/mus/public/cpp/property_type_converters.h"
|
| #include "components/mus/public/cpp/window.h"
|
| #include "components/mus/public/cpp/window_property.h"
|
| -#include "mash/wm/public/interfaces/container.mojom.h"
|
| #include "ui/aura/mus/mus_util.h"
|
| #include "ui/views/mus/native_widget_mus.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| -using mash::wm::mojom::Container;
|
| -
|
| namespace ash {
|
| namespace sysui {
|
|
|
| namespace {
|
|
|
| // Returns true if |widget| is in |container|.
|
| -bool IsInContainer(views::Widget* widget, Container container) {
|
| +bool IsInContainer(views::Widget* widget, mojom::Container container) {
|
| mus::Window* window =
|
| aura::GetMusWindow(widget->GetTopLevelWidget()->GetNativeWindow());
|
| - if (window->HasSharedProperty(mash::wm::mojom::kWindowContainer_Property))
|
| + if (window->HasSharedProperty(mojom::kWindowContainer_Property))
|
| return container ==
|
| - static_cast<Container>(window->GetSharedProperty<int32_t>(
|
| - mash::wm::mojom::kWindowContainer_Property));
|
| + static_cast<mojom::Container>(window->GetSharedProperty<int32_t>(
|
| + mojom::kWindowContainer_Property));
|
|
|
| return false;
|
| }
|
| @@ -40,11 +38,11 @@ ContainerDelegateMus::ContainerDelegateMus() {}
|
| ContainerDelegateMus::~ContainerDelegateMus() {}
|
|
|
| bool ContainerDelegateMus::IsInMenuContainer(views::Widget* widget) {
|
| - return IsInContainer(widget, Container::MENUS);
|
| + return IsInContainer(widget, mojom::Container::MENUS);
|
| }
|
|
|
| bool ContainerDelegateMus::IsInStatusContainer(views::Widget* widget) {
|
| - return IsInContainer(widget, Container::STATUS);
|
| + return IsInContainer(widget, mojom::Container::STATUS);
|
| }
|
|
|
| } // namespace sysui
|
|
|