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

Unified Diff: mash/wm/window_manager_application.cc

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/window_manager_application.h ('k') | mash/wm/window_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/window_manager_application.cc
diff --git a/mash/wm/window_manager_application.cc b/mash/wm/window_manager_application.cc
index 6042731b99be7298cd860c2d0b662bcd839f3eff..51a1fa71bb114f3c806d9dd269592aded58fec1d 100644
--- a/mash/wm/window_manager_application.cc
+++ b/mash/wm/window_manager_application.cc
@@ -145,8 +145,8 @@ void WindowManagerApplication::Initialize(shell::Connector* connector,
}
bool WindowManagerApplication::AcceptConnection(shell::Connection* connection) {
- connection->AddInterface<mojom::ShelfLayout>(this);
- connection->AddInterface<mojom::UserWindowController>(this);
+ connection->AddInterface<ash::mojom::ShelfLayout>(this);
+ connection->AddInterface<ash::mojom::UserWindowController>(this);
connection->AddInterface<mus::mojom::AcceleratorRegistrar>(this);
if (connection->GetRemoteIdentity().name() == "mojo:mash_session")
connection->GetInterface(&session_);
@@ -155,25 +155,26 @@ bool WindowManagerApplication::AcceptConnection(shell::Connection* connection) {
void WindowManagerApplication::Create(
shell::Connection* connection,
- mojo::InterfaceRequest<mojom::ShelfLayout> request) {
+ mojo::InterfaceRequest<ash::mojom::ShelfLayout> request) {
// TODO(msw): Handle multiple shelves (one per display).
if (!root_controllers_.empty() && (*root_controllers_.begin())->root()) {
shelf_layout_bindings_.AddBinding(shelf_layout_.get(), std::move(request));
} else {
- shelf_layout_requests_.push_back(base::WrapUnique(
- new mojo::InterfaceRequest<mojom::ShelfLayout>(std::move(request))));
+ shelf_layout_requests_.push_back(
+ base::WrapUnique(new mojo::InterfaceRequest<ash::mojom::ShelfLayout>(
+ std::move(request))));
}
}
void WindowManagerApplication::Create(
shell::Connection* connection,
- mojo::InterfaceRequest<mojom::UserWindowController> request) {
+ mojo::InterfaceRequest<ash::mojom::UserWindowController> request) {
if (!root_controllers_.empty() && (*root_controllers_.begin())->root()) {
user_window_controller_bindings_.AddBinding(user_window_controller_.get(),
std::move(request));
} else {
user_window_controller_requests_.push_back(base::WrapUnique(
- new mojo::InterfaceRequest<mojom::UserWindowController>(
+ new mojo::InterfaceRequest<ash::mojom::UserWindowController>(
std::move(request))));
}
}
« no previous file with comments | « mash/wm/window_manager_application.h ('k') | mash/wm/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698