summaryrefslogtreecommitdiffstats
path: root/mojo/examples/compositor_app
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-27 16:50:29 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-27 16:50:29 +0000
commit66bf7e2b99672c530495517abb88f5256af9d338 (patch)
treeee76efb8c0b492154ed3df2890ebea93eaa00fa0 /mojo/examples/compositor_app
parent89ad19365a5fb3899e2749ca646099d76f7446ad (diff)
downloadchromium_src-66bf7e2b99672c530495517abb88f5256af9d338.zip
chromium_src-66bf7e2b99672c530495517abb88f5256af9d338.tar.gz
chromium_src-66bf7e2b99672c530495517abb88f5256af9d338.tar.bz2
Shell / ShellClient -> ServiceProvider
Try #2 of https://codereview.chromium.org/298653010/ Fixed newly introduced GN dependency. TBR=darin@chromium.org BUG= Review URL: https://codereview.chromium.org/298003008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272989 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/compositor_app')
-rw-r--r--mojo/examples/compositor_app/compositor_app.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc
index f927cc2..c225fae 100644
--- a/mojo/examples/compositor_app/compositor_app.cc
+++ b/mojo/examples/compositor_app/compositor_app.cc
@@ -9,11 +9,11 @@
#include "base/message_loop/message_loop.h"
#include "mojo/examples/compositor_app/compositor_host.h"
#include "mojo/geometry/geometry_type_converters.h"
+#include "mojo/public/cpp/application/application.h"
#include "mojo/public/cpp/bindings/allocation_scope.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/shell/shell.mojom.h"
+#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
#include "mojo/services/native_viewport/native_viewport.mojom.h"
#include "ui/gfx/rect.h"
@@ -32,7 +32,8 @@ namespace examples {
class SampleApp : public Application, public NativeViewportClient {
public:
- explicit SampleApp(MojoHandle shell_handle) : Application(shell_handle) {
+ explicit SampleApp(MojoHandle service_provider_handle)
+ : Application(service_provider_handle) {
AllocationScope scope;
ConnectTo("mojo:mojo_native_viewport_service", &viewport_);
@@ -71,11 +72,11 @@ class SampleApp : public Application, public NativeViewportClient {
} // namespace mojo
extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain(
- MojoHandle shell_handle) {
+ MojoHandle service_provider_handle) {
base::MessageLoop loop;
mojo::GLES2Initializer gles2;
- mojo::examples::SampleApp app(shell_handle);
+ mojo::examples::SampleApp app(service_provider_handle);
loop.Run();
return MOJO_RESULT_OK;
}