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

Unified Diff: mash/quick_launch/quick_launch_application.cc

Issue 2118083002: ShellClient -> Service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus2
Patch Set: . Created 4 years, 5 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/quick_launch/quick_launch_application.h ('k') | mash/screenlock/screenlock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/quick_launch/quick_launch_application.cc
diff --git a/mash/quick_launch/quick_launch_application.cc b/mash/quick_launch/quick_launch_application.cc
index 4b2860e82cb13f829861b8c4046502648c80b52d..f93baa2a7eb66bc674733c287baee2cdcd6b5253 100644
--- a/mash/quick_launch/quick_launch_application.cc
+++ b/mash/quick_launch/quick_launch_application.cc
@@ -14,7 +14,7 @@
#include "services/catalog/public/interfaces/catalog.mojom.h"
#include "services/shell/public/cpp/application_runner.h"
#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/shell_client.h"
+#include "services/shell/public/cpp/service.h"
#include "services/tracing/public/cpp/tracing_impl.h"
#include "services/ui/common/gpu_service.h"
#include "ui/views/background.h"
@@ -164,9 +164,9 @@ void QuickLaunchApplication::RemoveWindow(views::Widget* window) {
base::MessageLoop::current()->QuitWhenIdle();
}
-void QuickLaunchApplication::Initialize(shell::Connector* connector,
- const shell::Identity& identity,
- uint32_t id) {
+void QuickLaunchApplication::OnStart(shell::Connector* connector,
+ const shell::Identity& identity,
+ uint32_t id) {
connector_ = connector;
ui::GpuService::Initialize(connector);
tracing_.Initialize(connector, identity.name());
@@ -178,7 +178,7 @@ void QuickLaunchApplication::Initialize(shell::Connector* connector,
Launch(mojom::kWindow, mojom::LaunchMode::MAKE_NEW);
}
-bool QuickLaunchApplication::AcceptConnection(shell::Connection* connection) {
+bool QuickLaunchApplication::OnConnect(shell::Connection* connection) {
connection->AddInterface<mojom::Launchable>(this);
return true;
}
« no previous file with comments | « mash/quick_launch/quick_launch_application.h ('k') | mash/screenlock/screenlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698