summaryrefslogtreecommitdiffstats
path: root/mojo/shell
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-02 23:04:01 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-02 23:04:01 +0000
commitb1f92bd80f3e2bd6bb0b74649acf4de81010c6c1 (patch)
tree19768ff1ed6a7567382c1254c8fe56ac05cc8287 /mojo/shell
parentd31e2484add25de2f07a69773d319ebc86210369 (diff)
downloadchromium_src-b1f92bd80f3e2bd6bb0b74649acf4de81010c6c1.zip
chromium_src-b1f92bd80f3e2bd6bb0b74649acf4de81010c6c1.tar.gz
chromium_src-b1f92bd80f3e2bd6bb0b74649acf4de81010c6c1.tar.bz2
mojo_shell needs to have an Environment set up.
BUG=None R=sky@chromium.org, sky Review URL: https://codereview.chromium.org/221973005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell')
-rw-r--r--mojo/shell/desktop/mojo_main.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/mojo/shell/desktop/mojo_main.cc b/mojo/shell/desktop/mojo_main.cc
index 9591ae8..98dc7a9 100644
--- a/mojo/shell/desktop/mojo_main.cc
+++ b/mojo/shell/desktop/mojo_main.cc
@@ -8,6 +8,7 @@
#include "base/macros.h" // TODO(vtl): Remove.
#include "base/message_loop/message_loop.h"
#include "mojo/common/message_pump_mojo.h" // TODO(vtl): Remove.
+#include "mojo/public/cpp/environment/environment.h"
#include "mojo/shell/child_process.h"
#include "mojo/shell/child_process_host.h" // TODO(vtl): Remove.
#include "mojo/shell/context.h"
@@ -36,6 +37,7 @@ class TestChildProcessHostDelegate
int main(int argc, char** argv) {
base::AtExitManager at_exit;
+ mojo::Environment env;
CommandLine::Init(argc, argv);
mojo::shell::InitializeLogging();