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

Unified Diff: chrome/app/mash/mash_runner.cc

Issue 1817443002: Rename mash_shell to mash_session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « chrome/app/mash/DEPS ('k') | mash/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/mash/mash_runner.cc
diff --git a/chrome/app/mash/mash_runner.cc b/chrome/app/mash/mash_runner.cc
index 61d0756da17b1a5c437715a3e849ada619eb7841..65021c2be89754251448e0371a2a14269c93e648 100644
--- a/chrome/app/mash/mash_runner.cc
+++ b/chrome/app/mash/mash_runner.cc
@@ -17,7 +17,7 @@
#include "components/resource_provider/resource_provider_app.h"
#include "content/public/common/content_switches.h"
#include "mash/quick_launch/quick_launch_application.h"
-#include "mash/shell/shell_application_delegate.h"
+#include "mash/session/session.h"
#include "mash/wm/window_manager_application.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/shell/background/background_shell.h"
@@ -85,8 +85,8 @@ class DefaultShellClient : public mojo::ShellClient,
return make_scoped_ptr(new ash::sysui::SysUIApplication);
if (name == "mojo:desktop_wm")
return make_scoped_ptr(new mash::wm::WindowManagerApplication);
- if (name == "mojo:mash_shell")
- return make_scoped_ptr(new mash::shell::ShellApplicationDelegate);
+ if (name == "mojo:mash_session")
+ return make_scoped_ptr(new mash::session::Session);
if (name == "mojo:mus")
return make_scoped_ptr(new mus::MandolineUIServicesApp);
if (name == "mojo:quick_launch")
@@ -187,7 +187,7 @@ void MashRunner::RunMain() {
shell_connection_.reset(new mojo::ShellConnection(
shell_client_.get(),
background_shell.CreateShellClientRequest("exe:chrome_mash")));
- shell_connection_->connector()->Connect("mojo:mash_shell");
+ shell_connection_->connector()->Connect("mojo:mash_session");
base::MessageLoop::current()->Run();
}
« no previous file with comments | « chrome/app/mash/DEPS ('k') | mash/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698