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

Unified Diff: ash/mus/window_manager_application.cc

Issue 2107383003: ash/mus: Store the InterfaceRequest<>s directly in the vector. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « ash/mus/window_manager_application.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager_application.cc
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
index 962667a1a9ede40c019d51891dd23e43e36c7f56..f8b18788b7cc885ff0e29e6649ef433b924f6c42 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -90,8 +90,7 @@ void WindowManagerApplication::Create(
if (!window_manager_->GetRootWindowControllers().empty()) {
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(std::move(request));
}
}
@@ -102,9 +101,7 @@ void WindowManagerApplication::Create(
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>(
- std::move(request))));
+ user_window_controller_requests_.push_back(std::move(request));
}
}
@@ -149,13 +146,13 @@ void WindowManagerApplication::OnRootWindowControllerAdded(
user_window_controller_->Initialize(controller);
for (auto& request : user_window_controller_requests_)
user_window_controller_bindings_.AddBinding(user_window_controller_.get(),
- std::move(*request));
+ std::move(request));
user_window_controller_requests_.clear();
// TODO(msw): figure out if this should be per display, or global.
shelf_layout_->Initialize(controller);
for (auto& request : shelf_layout_requests_)
- shelf_layout_bindings_.AddBinding(shelf_layout_.get(), std::move(*request));
+ shelf_layout_bindings_.AddBinding(shelf_layout_.get(), std::move(request));
shelf_layout_requests_.clear();
}
« no previous file with comments | « ash/mus/window_manager_application.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698