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

Unified Diff: mash/wm/window_manager_application.cc

Issue 1675083002: Rename ApplicationDelegate to ShellClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@delegate
Patch Set: . Created 4 years, 10 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') | media/mojo/services/main.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 47570a512d40f485876c7e82c068a6c214aae68e..5a0a5ab7dc28147553171b9e45bcbb64a1095323 100644
--- a/mash/wm/window_manager_application.cc
+++ b/mash/wm/window_manager_application.cc
@@ -15,7 +15,7 @@
#include "mash/wm/root_windows_observer.h"
#include "mash/wm/user_window_controller_impl.h"
#include "mojo/services/tracing/public/cpp/tracing_impl.h"
-#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/connection.h"
#include "mojo/shell/public/cpp/shell.h"
#include "ui/mojo/init/ui_init.h"
#include "ui/views/mus/aura_init.h"
@@ -120,15 +120,14 @@ void WindowManagerApplication::Initialize(mojo::Shell* shell,
RootWindowController::CreateUsingWindowTreeHost(this));
}
-bool WindowManagerApplication::AcceptConnection(
- mojo::ApplicationConnection* connection) {
+bool WindowManagerApplication::AcceptConnection(mojo::Connection* connection) {
connection->AddService<mash::wm::mojom::UserWindowController>(this);
connection->AddService<mus::mojom::AcceleratorRegistrar>(this);
return true;
}
void WindowManagerApplication::Create(
- mojo::ApplicationConnection* connection,
+ mojo::Connection* connection,
mojo::InterfaceRequest<mash::wm::mojom::UserWindowController> request) {
if (!root_controllers_.empty() && (*root_controllers_.begin())->root()) {
user_window_controller_binding_.AddBinding(user_window_controller_.get(),
@@ -141,7 +140,7 @@ void WindowManagerApplication::Create(
}
void WindowManagerApplication::Create(
- mojo::ApplicationConnection* connection,
+ mojo::Connection* connection,
mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request) {
static int accelerator_registrar_count = 0;
if (accelerator_registrar_count == std::numeric_limits<int>::max()) {
« no previous file with comments | « mash/wm/window_manager_application.h ('k') | media/mojo/services/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698