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

Unified Diff: trunk/src/mojo/shell/shell_test_helper.h

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/desktop/mojo_main.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/mojo/shell/shell_test_helper.h
===================================================================
--- trunk/src/mojo/shell/shell_test_helper.h (revision 272588)
+++ trunk/src/mojo/shell/shell_test_helper.h (working copy)
@@ -9,6 +9,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "base/threading/thread.h"
+#include "mojo/public/cpp/environment/environment.h"
#include "mojo/public/interfaces/shell/shell.mojom.h"
namespace base {
@@ -40,6 +41,8 @@
// Invoked once connection has been established.
void OnShellStarted();
+ Environment environment_;
+
base::Thread shell_thread_;
// If non-null we're in Init() and waiting for connection.
« no previous file with comments | « trunk/src/mojo/shell/desktop/mojo_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698