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

Unified Diff: mojo/shell/desktop/mojo_main.cc

Issue 491443005: Get rid of KeepAlive. Quit shell when all urls run directly by Context are closed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Bring back ConnectToServiceViaNetwork Created 6 years, 4 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
Index: mojo/shell/desktop/mojo_main.cc
diff --git a/mojo/shell/desktop/mojo_main.cc b/mojo/shell/desktop/mojo_main.cc
index 38017cbcd5b54b93552d7fdbddaf7632ed2da1f0..d61ea1952316403010b011375fea2d5050689d09 100644
--- a/mojo/shell/desktop/mojo_main.cc
+++ b/mojo/shell/desktop/mojo_main.cc
@@ -10,10 +10,20 @@
#include "mojo/shell/child_process.h"
#include "mojo/shell/context.h"
#include "mojo/shell/init.h"
-#include "mojo/shell/run.h"
#include "mojo/shell/switches.h"
#include "ui/gl/gl_surface.h"
+namespace {
+
+void RunApps(mojo::shell::Context* context, std::vector<GURL> app_urls) {
+ for (std::vector<GURL>::const_iterator it = app_urls.begin();
+ it != app_urls.end(); ++it) {
+ context->Run(*it);
+ }
+}
+
+} // namespace
+
int main(int argc, char** argv) {
base::AtExitManager at_exit;
base::CommandLine::Init(argc, argv);
@@ -49,7 +59,7 @@ int main(int argc, char** argv) {
app_urls.push_back(GURL(*it));
message_loop.PostTask(FROM_HERE,
- base::Bind(mojo::shell::Run,
+ base::Bind(RunApps,
&shell_context,
app_urls));
message_loop.Run();

Powered by Google App Engine
This is Rietveld 408576698