diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-27 16:04:28 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-27 16:04:28 +0000 |
| commit | 76a13298a02a60080c98dd936d3b32def6b2d2bf (patch) | |
| tree | c2290494bfa8855d112ae7a00fcea6ed64166d39 /mojo/examples/pepper_container_app | |
| parent | 922f25039d939159501fad266518290b2c05fe2a (diff) | |
| download | chromium_src-76a13298a02a60080c98dd936d3b32def6b2d2bf.zip chromium_src-76a13298a02a60080c98dd936d3b32def6b2d2bf.tar.gz chromium_src-76a13298a02a60080c98dd936d3b32def6b2d2bf.tar.bz2 | |
Revert 272983 "Change Shell / ShellClient to ServiceProvider"
> Change Shell / ShellClient to ServiceProvider
>
> BUG=
> R=darin@chromium.org
>
> Review URL: https://codereview.chromium.org/298653010
TBR=davemoore@chromium.org
Review URL: https://codereview.chromium.org/304593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272984 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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mojo/examples/pepper_container_app/pepper_container_app.cc b/mojo/examples/pepper_container_app/pepper_container_app.cc index e678613..d2aab41 100644 --- a/mojo/examples/pepper_container_app/pepper_container_app.cc +++ b/mojo/examples/pepper_container_app/pepper_container_app.cc @@ -11,12 +11,12 @@ #include "mojo/examples/pepper_container_app/plugin_instance.h" #include "mojo/examples/pepper_container_app/plugin_module.h" #include "mojo/examples/pepper_container_app/type_converters.h" -#include "mojo/public/cpp/application/application.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" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ppapi/c/pp_rect.h" #include "ppapi/shared_impl/proxy_lock.h" @@ -38,8 +38,8 @@ class PepperContainerApp: public Application, public NativeViewportClient, public MojoPpapiGlobals::Delegate { public: - explicit PepperContainerApp(MojoHandle service_provider_handle) - : Application(service_provider_handle), + explicit PepperContainerApp(MojoHandle shell_handle) + : Application(shell_handle), ppapi_globals_(this), plugin_module_(new PluginModule) { mojo::AllocationScope scope; @@ -120,11 +120,11 @@ class PepperContainerApp: public Application, } // namespace mojo extern "C" PEPPER_CONTAINER_APP_EXPORT MojoResult CDECL MojoMain( - MojoHandle service_provider_handle) { + MojoHandle shell_handle) { mojo::Environment env; mojo::GLES2Initializer gles2; base::MessageLoop run_loop; - mojo::examples::PepperContainerApp app(service_provider_handle); + mojo::examples::PepperContainerApp app(shell_handle); run_loop.Run(); return MOJO_RESULT_OK; |