OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/macros.h" | 6 #include "base/macros.h" |
7 #include "examples/bitmap_uploader/bitmap_uploader.h" | 7 #include "examples/bitmap_uploader/bitmap_uploader.h" |
8 #include "examples/wm_flow/app/embedder.mojom.h" | 8 #include "examples/wm_flow/app/embedder.mojom.h" |
9 #include "examples/wm_flow/embedded/embeddee.mojom.h" | 9 #include "examples/wm_flow/embedded/embeddee.mojom.h" |
10 #include "mojo/application/application_runner_chromium.h" | 10 #include "mojo/application/application_runner_chromium.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 return true; | 60 return true; |
61 } | 61 } |
62 | 62 |
63 // Overridden from mojo::ViewManagerDelegate: | 63 // Overridden from mojo::ViewManagerDelegate: |
64 virtual void OnEmbed( | 64 virtual void OnEmbed( |
65 mojo::View* root, | 65 mojo::View* root, |
66 mojo::ServiceProviderImpl* exported_services, | 66 mojo::ServiceProviderImpl* exported_services, |
67 scoped_ptr<mojo::ServiceProvider> imported_services) override { | 67 scoped_ptr<mojo::ServiceProvider> imported_services) override { |
68 bitmap_uploader_.reset(new mojo::BitmapUploader(root)); | 68 bitmap_uploader_.reset(new mojo::BitmapUploader(root)); |
69 bitmap_uploader_->Init(shell_); | 69 bitmap_uploader_->Init(shell_); |
| 70 // BitmapUploader does not track view size changes, we would |
| 71 // need to subscribe to OnViewBoundsChanged and tell the bitmap uploader |
| 72 // to invalidate itself. This is better done once if had a per-view |
| 73 // object instead of holding per-view state on the ApplicationDelegate. |
70 bitmap_uploader_->SetColor(SK_ColorMAGENTA); | 74 bitmap_uploader_->SetColor(SK_ColorMAGENTA); |
71 | 75 |
72 exported_services->AddService(&embeddee_factory_); | 76 exported_services->AddService(&embeddee_factory_); |
| 77 // FIXME: embedder_ is wrong for the same reason the embedee_ storage is |
| 78 // wrong in app.cc. We need separate per-instance storage not on the |
| 79 // application delegate. |
73 mojo::ConnectToService(imported_services.get(), &embedder_); | 80 mojo::ConnectToService(imported_services.get(), &embedder_); |
74 embedder_->HelloWorld(base::Bind(&WMFlowEmbedded::HelloWorldAck, | 81 embedder_->HelloWorld(base::Bind(&WMFlowEmbedded::HelloWorldAck, |
75 base::Unretained(this))); | 82 base::Unretained(this))); |
76 } | 83 } |
77 virtual void OnViewManagerDisconnected( | 84 virtual void OnViewManagerDisconnected( |
78 mojo::ViewManager* view_manager) override {} | 85 mojo::ViewManager* view_manager) override {} |
79 | 86 |
80 void HelloWorldAck() { | 87 void HelloWorldAck() { |
81 printf("HelloWorld() ack'ed\n"); | 88 printf("HelloWorld() ack'ed\n"); |
82 } | 89 } |
83 | 90 |
84 mojo::Shell* shell_; | 91 mojo::Shell* shell_; |
85 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_; | 92 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_; |
86 EmbedderPtr embedder_; | 93 EmbedderPtr embedder_; |
87 mojo::InterfaceFactoryImpl<EmbeddeeImpl> embeddee_factory_; | 94 mojo::InterfaceFactoryImpl<EmbeddeeImpl> embeddee_factory_; |
88 scoped_ptr<mojo::BitmapUploader> bitmap_uploader_; | 95 scoped_ptr<mojo::BitmapUploader> bitmap_uploader_; |
89 | 96 |
90 DISALLOW_COPY_AND_ASSIGN(WMFlowEmbedded); | 97 DISALLOW_COPY_AND_ASSIGN(WMFlowEmbedded); |
91 }; | 98 }; |
92 | 99 |
93 } // namespace examples | 100 } // namespace examples |
94 | 101 |
95 MojoResult MojoMain(MojoHandle shell_handle) { | 102 MojoResult MojoMain(MojoHandle shell_handle) { |
96 mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded); | 103 mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded); |
97 return runner.Run(shell_handle); | 104 return runner.Run(shell_handle); |
98 } | 105 } |
99 | 106 |
OLD | NEW |