Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Unified Diff: mash/wm/root_window_controller.h

Issue 2024313002: Moves mash/wm/public -> ash/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mash/wm/public/interfaces/user_window_controller.mojom ('k') | mash/wm/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/root_window_controller.h
diff --git a/mash/wm/root_window_controller.h b/mash/wm/root_window_controller.h
index da8afb623f5625c3efd71c3f6a44f8468d5bb6ab..80b1b31a4a4f9a19cb444a1499be016e91fc7f75 100644
--- a/mash/wm/root_window_controller.h
+++ b/mash/wm/root_window_controller.h
@@ -7,12 +7,12 @@
#include <memory>
+#include "ash/public/interfaces/container.mojom.h"
#include "components/mus/public/cpp/window_observer.h"
#include "components/mus/public/cpp/window_tree_client.h"
#include "components/mus/public/cpp/window_tree_client_delegate.h"
#include "components/mus/public/interfaces/window_manager_constants.mojom.h"
#include "components/mus/public/interfaces/window_tree_host.mojom.h"
-#include "mash/wm/public/interfaces/container.mojom.h"
#include "mash/wm/shelf_layout_manager_delegate.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "ui/display/display.h"
@@ -70,7 +70,7 @@ class RootWindowController : public mus::WindowObserver,
int window_count() { return window_count_; }
void IncrementWindowCount() { ++window_count_; }
- mus::Window* GetWindowForContainer(mojom::Container container);
+ mus::Window* GetWindowForContainer(ash::mojom::Container container);
bool WindowIsContainer(const mus::Window* window) const;
WindowManager* window_manager() { return window_manager_.get(); }
@@ -111,8 +111,8 @@ class RootWindowController : public mus::WindowObserver,
void OnShelfWindowAvailable() override;
// Sets up the window containers used for z-space management.
- void CreateContainer(mash::wm::mojom::Container container,
- mash::wm::mojom::Container parent_container);
+ void CreateContainer(ash::mojom::Container container,
+ ash::mojom::Container parent_container);
void CreateContainers();
WindowManagerApplication* app_;
« no previous file with comments | « mash/wm/public/interfaces/user_window_controller.mojom ('k') | mash/wm/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698