| Index: mojo/environment/environment.cc
|
| diff --git a/mojo/environment/environment.cc b/mojo/environment/environment.cc
|
| index 27af33b6ae5d652ceff6b806c54df1c19e2705d7..ab182a64de06052499231c3dcad3e1b2d40cdf15 100644
|
| --- a/mojo/environment/environment.cc
|
| +++ b/mojo/environment/environment.cc
|
| @@ -4,17 +4,32 @@
|
|
|
| #include "mojo/public/cpp/environment/environment.h"
|
|
|
| +#include "mojo/common/environment_data.h"
|
| +
|
| namespace mojo {
|
|
|
| -// These methods do nothing as we rely on LazyInstance<T> to instantiate all of
|
| -// our global state in this implementation of the environment library.
|
| +class Environment::Data {
|
| + public:
|
| + Data();
|
| + ~Data();
|
| +
|
| + private:
|
| + common::EnvironmentData data_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(Data);
|
| +};
|
| +
|
| +Environment::Data::Data() {
|
| +}
|
| +
|
| +Environment::Data::~Data() {
|
| +}
|
|
|
| -Environment::Environment() {
|
| - // no-op
|
| +Environment::Environment() : data_(new Environment::Data) {
|
| }
|
|
|
| Environment::~Environment() {
|
| - // no-op
|
| + delete data_;
|
| }
|
|
|
| } // namespace mojo
|
|
|