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

Unified Diff: trunk/src/mojo/environment/environment.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
Index: trunk/src/mojo/environment/environment.cc
===================================================================
--- trunk/src/mojo/environment/environment.cc (revision 272588)
+++ trunk/src/mojo/environment/environment.cc (working copy)
@@ -4,16 +4,32 @@
#include "mojo/public/cpp/environment/environment.h"
+#include "mojo/common/environment_data.h"
+
namespace mojo {
-// These methods are intentionally not implemented so that there is a link
-// error if someone uses them in a Chromium-environment.
-#if 0
-Environment::Environment() {
+class Environment::Data {
+ public:
+ Data();
+ ~Data();
+
+ private:
+ common::EnvironmentData data_;
+
+ DISALLOW_COPY_AND_ASSIGN(Data);
+};
+
+Environment::Data::Data() {
}
+Environment::Data::~Data() {
+}
+
+Environment::Environment() : data_(new Environment::Data) {
+}
+
Environment::~Environment() {
+ delete data_;
}
-#endif
} // namespace mojo
« no previous file with comments | « trunk/src/mojo/common/handle_watcher_unittest.cc ('k') | trunk/src/mojo/examples/pepper_container_app/pepper_container_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698