diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-23 10:41:13 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-23 10:41:13 +0000 |
| commit | bf418af31de8ba8aa201e45ab4b22bf93a192805 (patch) | |
| tree | 350975bedd8bf76bd9c55ea934905c0f816a9bb3 /mojo/examples/pepper_container_app | |
| parent | 56f854a66b24cae18415673ae6665fdf9e9da80d (diff) | |
| download | chromium_src-bf418af31de8ba8aa201e45ab4b22bf93a192805.zip chromium_src-bf418af31de8ba8aa201e45ab4b22bf93a192805.tar.gz chromium_src-bf418af31de8ba8aa201e45ab4b22bf93a192805.tar.bz2 | |
Mojo: nuke EnvironmentData
With this change, Mojo applications that link against mojo_environment_chromium
do not need to instantiate mojo::Environment. We rely on AtExitManager for all
finalization of singleton objects. This frees us up to use the familiar
base::Singleton and base::LazyInstance for any such state. Tests can use
ShadowingAtExitManager to clean the environment between test runs.
It becomes a link error to use mojo::Environment if you are not linking against
mojo_environment_standalone. I plan to follow this up with a change that buries
mojo::Environment for the case where you are linking against
mojo_environment_standalone. Ideally, this means no one will ever need to think
about mojo::Environment again.
Review URL: https://codereview.chromium.org/281353005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/pepper_container_app')
| -rw-r--r-- | mojo/examples/pepper_container_app/pepper_container_app.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mojo/examples/pepper_container_app/pepper_container_app.cc b/mojo/examples/pepper_container_app/pepper_container_app.cc index d2aab41..8fccce6 100644 --- a/mojo/examples/pepper_container_app/pepper_container_app.cc +++ b/mojo/examples/pepper_container_app/pepper_container_app.cc @@ -12,7 +12,6 @@ #include "mojo/examples/pepper_container_app/plugin_module.h" #include "mojo/examples/pepper_container_app/type_converters.h" #include "mojo/public/cpp/bindings/allocation_scope.h" -#include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/gles2/gles2.h" #include "mojo/public/cpp/shell/application.h" #include "mojo/public/cpp/system/core.h" @@ -121,7 +120,6 @@ class PepperContainerApp: public Application, extern "C" PEPPER_CONTAINER_APP_EXPORT MojoResult CDECL MojoMain( MojoHandle shell_handle) { - mojo::Environment env; mojo::GLES2Initializer gles2; base::MessageLoop run_loop; mojo::examples::PepperContainerApp app(shell_handle); |