| 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 "examples/bitmap_uploader/bitmap_uploader.h" | 10 #include "examples/bitmap_uploader/bitmap_uploader.h" |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 virtual bool ConfigureIncomingConnection( | 75 virtual bool ConfigureIncomingConnection( |
| 76 mojo::ApplicationConnection* connection) override { | 76 mojo::ApplicationConnection* connection) override { |
| 77 connection->AddService(view_manager_client_factory_.get()); | 77 connection->AddService(view_manager_client_factory_.get()); |
| 78 return true; | 78 return true; |
| 79 } | 79 } |
| 80 | 80 |
| 81 void OnConnect(bool success) {} | 81 void OnConnect(bool success) {} |
| 82 | 82 |
| 83 // Overridden from mojo::ViewManagerDelegate: | 83 // Overridden from mojo::ViewManagerDelegate: |
| 84 virtual void OnEmbed( | 84 virtual void OnEmbed( |
| 85 mojo::ViewManager* view_manager, | |
| 86 mojo::View* root, | 85 mojo::View* root, |
| 87 mojo::ServiceProviderImpl* exported_services, | 86 mojo::ServiceProviderImpl* exported_services, |
| 88 scoped_ptr<mojo::ServiceProvider> imported_services) override { | 87 scoped_ptr<mojo::ServiceProvider> imported_services) override { |
| 89 root->AddObserver(this); | 88 root->AddObserver(this); |
| 90 mojo::BitmapUploader* uploader = new mojo::BitmapUploader(root); | 89 mojo::BitmapUploader* uploader = new mojo::BitmapUploader(root); |
| 91 uploaders_[root] = uploader; | 90 uploaders_[root] = uploader; |
| 92 uploader->Init(shell_); | 91 uploader->Init(shell_); |
| 93 uploader->SetColor(kColors[embed_count_++ % arraysize(kColors)]); | 92 uploader->SetColor(kColors[embed_count_++ % arraysize(kColors)]); |
| 94 | 93 |
| 95 mojo::View* embed = mojo::View::Create(view_manager); | 94 mojo::View* embed = mojo::View::Create(root->view_manager()); |
| 96 root->AddChild(embed); | 95 root->AddChild(embed); |
| 97 mojo::Rect bounds; | 96 mojo::Rect bounds; |
| 98 bounds.x = bounds.y = 25; | 97 bounds.x = bounds.y = 25; |
| 99 bounds.width = root->bounds().width - 50; | 98 bounds.width = root->bounds().width - 50; |
| 100 bounds.height = root->bounds().height - 50; | 99 bounds.height = root->bounds().height - 50; |
| 101 embed->SetBounds(bounds); | 100 embed->SetBounds(bounds); |
| 102 embed->SetVisible(true); | 101 embed->SetVisible(true); |
| 103 | 102 |
| 104 scoped_ptr<mojo::ServiceProviderImpl> registry( | 103 scoped_ptr<mojo::ServiceProviderImpl> registry( |
| 105 new mojo::ServiceProviderImpl); | 104 new mojo::ServiceProviderImpl); |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 | 148 |
| 150 DISALLOW_COPY_AND_ASSIGN(WMFlowApp); | 149 DISALLOW_COPY_AND_ASSIGN(WMFlowApp); |
| 151 }; | 150 }; |
| 152 | 151 |
| 153 } // namespace examples | 152 } // namespace examples |
| 154 | 153 |
| 155 MojoResult MojoMain(MojoHandle shell_handle) { | 154 MojoResult MojoMain(MojoHandle shell_handle) { |
| 156 mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp); | 155 mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp); |
| 157 return runner.Run(shell_handle); | 156 return runner.Run(shell_handle); |
| 158 } | 157 } |
| OLD | NEW |