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

Unified Diff: ash/mus/window_manager_application.cc

Issue 2215133002: Change signature of OnConnect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup
Patch Set: . Created 4 years, 4 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') | ash/sysui/sysui_application.h » ('j') | 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 031eced62637bbb1806c9e07d2e43a7334784c4f..9acd3652b29e406b3a35a22c3f7c209cf8953428 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -111,12 +111,13 @@ void WindowManagerApplication::OnStart(const shell::Identity& identity) {
InitWindowManager(window_tree_client);
}
-bool WindowManagerApplication::OnConnect(shell::Connection* connection) {
- connection->AddInterface<mojom::ShelfLayout>(this);
- connection->AddInterface<mojom::UserWindowController>(this);
- connection->AddInterface<ui::mojom::AcceleratorRegistrar>(this);
- if (connection->GetRemoteIdentity().name() == "mojo:mash_session") {
- connector()->ConnectToInterface(connection->GetRemoteIdentity(), &session_);
+bool WindowManagerApplication::OnConnect(const shell::Identity& remote_identity,
+ shell::InterfaceRegistry* registry) {
+ registry->AddInterface<mojom::ShelfLayout>(this);
+ registry->AddInterface<mojom::UserWindowController>(this);
+ registry->AddInterface<ui::mojom::AcceleratorRegistrar>(this);
+ if (remote_identity.name() == "mojo:mash_session") {
+ connector()->ConnectToInterface(remote_identity, &session_);
session_->AddScreenlockStateListener(
screenlock_state_listener_binding_.CreateInterfacePtrAndBind());
}
« no previous file with comments | « ash/mus/window_manager_application.h ('k') | ash/sysui/sysui_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698