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

Unified Diff: mojo/runner/desktop/launcher_process.cc

Issue 1107233002: Move runner stuff into a runner namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 8 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 | « mojo/runner/desktop/launcher_process.h ('k') | mojo/runner/desktop/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/desktop/launcher_process.cc
diff --git a/mojo/runner/desktop/launcher_process.cc b/mojo/runner/desktop/launcher_process.cc
index ebbfccbe93db0755ae73c454e62b22995a258e7c..d8d9f9a114cd039d15d5a49fdeb7a577a5c7e935 100644
--- a/mojo/runner/desktop/launcher_process.cc
+++ b/mojo/runner/desktop/launcher_process.cc
@@ -19,7 +19,7 @@
#include "mojo/runner/switches.h"
namespace mojo {
-namespace shell {
+namespace runner {
namespace {
// Whether we're currently tracing.
@@ -75,7 +75,7 @@ void StopTracingAndFlushToDisk() {
flush_complete_event.Wait();
}
-void StartApp(mojo::shell::Context* context) {
+void StartApp(mojo::runner::Context* context) {
// If a mojo app isn't specified (i.e. for an apptest), run the mojo shell's
// window manager.
GURL app_url(GURL("mojo:window_manager"));
@@ -108,7 +108,7 @@ int LauncherProcessMain(int argc, char** argv) {
// We want the shell::Context to outlive the MessageLoop so that pipes are
// all gracefully closed / error-out before we try to shut the Context down.
- mojo::shell::Context shell_context;
+ Context shell_context;
{
base::MessageLoop message_loop;
if (!shell_context.Init()) {
@@ -132,5 +132,5 @@ int LauncherProcessMain(int argc, char** argv) {
return 0;
}
-} // namespace shell
+} // namespace runner
} // namespace mojo
« no previous file with comments | « mojo/runner/desktop/launcher_process.h ('k') | mojo/runner/desktop/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698