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

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

Issue 299263002: Revert 272472 "Mojo: nuke EnvironmentData" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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
« no previous file with comments | « trunk/src/mojo/shell/context.cc ('k') | trunk/src/mojo/shell/shell_test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/mojo/shell/desktop/mojo_main.cc
===================================================================
--- trunk/src/mojo/shell/desktop/mojo_main.cc (revision 272588)
+++ trunk/src/mojo/shell/desktop/mojo_main.cc (working copy)
@@ -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 @@
int main(int argc, char** argv) {
base::AtExitManager at_exit;
+ mojo::Environment env;
CommandLine::Init(argc, argv);
mojo::shell::InitializeLogging();
« no previous file with comments | « trunk/src/mojo/shell/context.cc ('k') | trunk/src/mojo/shell/shell_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698