Index: mash/wm/user_window_controller_impl.h |
diff --git a/mash/wm/user_window_controller_impl.h b/mash/wm/user_window_controller_impl.h |
index 459f0c8f17454b85d6688122b31573c4c5c141e1..2f35cf314f5f47a7c1089abbdf19e2640772387c 100644 |
--- a/mash/wm/user_window_controller_impl.h |
+++ b/mash/wm/user_window_controller_impl.h |
@@ -9,11 +9,11 @@ |
#include <memory> |
+#include "ash/public/interfaces/user_window_controller.mojom.h" |
#include "base/macros.h" |
#include "components/mus/common/types.h" |
#include "components/mus/public/cpp/window_observer.h" |
#include "components/mus/public/cpp/window_tree_client_observer.h" |
-#include "mash/wm/public/interfaces/user_window_controller.mojom.h" |
namespace mash { |
namespace wm { |
@@ -21,14 +21,14 @@ namespace wm { |
class RootWindowController; |
class WindowPropertyObserver; |
-class UserWindowControllerImpl : public mojom::UserWindowController, |
+class UserWindowControllerImpl : public ash::mojom::UserWindowController, |
public mus::WindowObserver, |
public mus::WindowTreeClientObserver { |
public: |
UserWindowControllerImpl(); |
~UserWindowControllerImpl() override; |
- mojom::UserWindowObserver* user_window_observer() const { |
+ ash::mojom::UserWindowObserver* user_window_observer() const { |
return user_window_observer_.get(); |
} |
@@ -55,11 +55,12 @@ class UserWindowControllerImpl : public mojom::UserWindowController, |
mus::Window* lost_focus) override; |
// mojom::UserWindowController: |
- void AddUserWindowObserver(mojom::UserWindowObserverPtr observer) override; |
+ void AddUserWindowObserver( |
+ ash::mojom::UserWindowObserverPtr observer) override; |
void FocusUserWindow(uint32_t window_id) override; |
RootWindowController* root_controller_; |
- mojom::UserWindowObserverPtr user_window_observer_; |
+ ash::mojom::UserWindowObserverPtr user_window_observer_; |
std::unique_ptr<WindowPropertyObserver> window_property_observer_; |
uint32_t next_id_ = 1u; |