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 <map> | 5 #include <map> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
10 #include "mojo/application/application_runner_chromium.h" | 10 #include "mojo/application/application_runner_chromium.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 mojo::ServiceProviderImpl* exported_services, | 86 mojo::ServiceProviderImpl* exported_services, |
87 scoped_ptr<mojo::ServiceProvider> imported_services) override { | 87 scoped_ptr<mojo::ServiceProvider> imported_services) override { |
88 root->AddObserver(this); | 88 root->AddObserver(this); |
89 mojo::BitmapUploader* uploader = new mojo::BitmapUploader(root); | 89 mojo::BitmapUploader* uploader = new mojo::BitmapUploader(root); |
90 uploaders_[root] = uploader; | 90 uploaders_[root] = uploader; |
91 uploader->Init(shell_); | 91 uploader->Init(shell_); |
92 uploader->SetColor(kColors[embed_count_++ % arraysize(kColors)]); | 92 uploader->SetColor(kColors[embed_count_++ % arraysize(kColors)]); |
93 | 93 |
94 mojo::View* embed = mojo::View::Create(view_manager); | 94 mojo::View* embed = mojo::View::Create(view_manager); |
95 root->AddChild(embed); | 95 root->AddChild(embed); |
96 gfx::Rect bounds = gfx::Rect(root->bounds().size()); | 96 mojo::Rect bounds; |
97 bounds.Inset(25, 25); | 97 bounds.x = bounds.y = 25; |
| 98 bounds.width = root->bounds().width - 50; |
| 99 bounds.height = root->bounds().height - 50; |
98 embed->SetBounds(bounds); | 100 embed->SetBounds(bounds); |
99 | 101 |
100 scoped_ptr<mojo::ServiceProviderImpl> registry( | 102 scoped_ptr<mojo::ServiceProviderImpl> registry( |
101 new mojo::ServiceProviderImpl); | 103 new mojo::ServiceProviderImpl); |
102 // Expose some services to the embeddee... | 104 // Expose some services to the embeddee... |
103 registry->AddService(&embedder_factory_); | 105 registry->AddService(&embedder_factory_); |
104 scoped_ptr<mojo::ServiceProvider> imported = | 106 scoped_ptr<mojo::ServiceProvider> imported = |
105 embed->Embed("mojo:wm_flow_embedded", registry.Pass()); | 107 embed->Embed("mojo:wm_flow_embedded", registry.Pass()); |
106 mojo::ConnectToService(imported.get(), &embeddee_); | 108 mojo::ConnectToService(imported.get(), &embeddee_); |
107 embeddee_->HelloBack(base::Bind(&WMFlowApp::HelloBackAck, | 109 embeddee_->HelloBack(base::Bind(&WMFlowApp::HelloBackAck, |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 | 147 |
146 DISALLOW_COPY_AND_ASSIGN(WMFlowApp); | 148 DISALLOW_COPY_AND_ASSIGN(WMFlowApp); |
147 }; | 149 }; |
148 | 150 |
149 } // namespace examples | 151 } // namespace examples |
150 | 152 |
151 MojoResult MojoMain(MojoHandle shell_handle) { | 153 MojoResult MojoMain(MojoHandle shell_handle) { |
152 mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp); | 154 mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp); |
153 return runner.Run(shell_handle); | 155 return runner.Run(shell_handle); |
154 } | 156 } |
OLD | NEW |