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

Unified Diff: shell/launcher_main.cc

Issue 775343004: Move //mojo/shell to //shell (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « shell/init.cc ('k') | shell/mojo_url_resolver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/launcher_main.cc
diff --git a/mojo/shell/launcher_main.cc b/shell/launcher_main.cc
similarity index 92%
rename from mojo/shell/launcher_main.cc
rename to shell/launcher_main.cc
index 342446b4b8cf43e8fab5c83cd76578164bcc4dab..a4d0b8a9352ea3fd03bc751d65d11d57c3e8d4db 100644
--- a/mojo/shell/launcher_main.cc
+++ b/shell/launcher_main.cc
@@ -10,9 +10,9 @@
#include "base/run_loop.h"
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/shell/external_application_registrar_connection.h"
-#include "mojo/shell/in_process_dynamic_service_runner.h"
-#include "mojo/shell/init.h"
+#include "shell/external_application_registrar_connection.h"
+#include "shell/in_process_dynamic_service_runner.h"
+#include "shell/init.h"
#include "url/gurl.h"
namespace {
@@ -59,8 +59,7 @@ class Launcher {
mojo::shell::InProcessDynamicServiceRunner service_runner(nullptr);
run_loop_.reset(new base::RunLoop);
service_runner.Start(
- app_path_,
- shell_handle_.Pass(),
+ app_path_, shell_handle_.Pass(),
base::Bind(&Launcher::OnAppCompleted, base::Unretained(this)));
run_loop_->Run();
run_loop_.reset();
@@ -77,9 +76,7 @@ class Launcher {
run_loop_->Quit();
}
- void OnAppCompleted() {
- run_loop_->Quit();
- }
+ void OnAppCompleted() { run_loop_->Quit(); }
const base::FilePath app_path_;
const GURL app_url_;
« no previous file with comments | « shell/init.cc ('k') | shell/mojo_url_resolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698