summaryrefslogtreecommitdiffstats
path: root/mojo/shell/shell.cc
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-18 22:28:43 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-18 22:28:43 +0000
commit25d8c048873f826e9063fab6810a62d9830b7549 (patch)
tree3bbd10713de5356f940da9f0a86d577cfc20cd70 /mojo/shell/shell.cc
parent0ba789ead933b0016de90184adf808781905ef24 (diff)
downloadchromium_src-25d8c048873f826e9063fab6810a62d9830b7549.zip
chromium_src-25d8c048873f826e9063fab6810a62d9830b7549.tar.gz
chromium_src-25d8c048873f826e9063fab6810a62d9830b7549.tar.bz2
Revert "Teach mojo_shell how to load http URLs"
This reverts commit 2410e4c01a215a487490e7bf87c4369cb8c13e53. This CL doens't compile on Linux x64. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell/shell.cc')
-rw-r--r--mojo/shell/shell.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/mojo/shell/shell.cc b/mojo/shell/shell.cc
index 74d6a13..72f697f 100644
--- a/mojo/shell/shell.cc
+++ b/mojo/shell/shell.cc
@@ -8,9 +8,7 @@
#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) {
@@ -21,10 +19,6 @@ 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.";