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

Unified Diff: mojo/shell/shell.cc

Issue 27943002: Teach mojo_shell how to load http URLs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix lifetime Created 7 years, 2 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/shell.cc
diff --git a/mojo/shell/shell.cc b/mojo/shell/shell.cc
index 72f697f232c2910b6e76cb49401c824ca8dea65b..74d6a13fa5ead25cf89e77106a95cc1198c55af9 100644
--- a/mojo/shell/shell.cc
+++ b/mojo/shell/shell.cc
@@ -8,7 +8,9 @@
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
#include "mojo/shell/app_container.h"
+#include "mojo/shell/storage.h"
#include "mojo/shell/switches.h"
+#include "mojo/shell/task_runners.h"
#include "mojo/system/core_impl.h"
int main(int argc, char** argv) {
@@ -19,6 +21,10 @@ int main(int argc, char** argv) {
base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+ // TODO(abarth): Group these objects into a "context" object.
+ mojo::shell::TaskRunners task_runners(message_loop.message_loop_proxy());
+ mojo::shell::Storage storage;
+
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
if (!command_line.HasSwitch(switches::kApp)) {
LOG(ERROR) << "No app path specified.";

Powered by Google App Engine
This is Rietveld 408576698