Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Side by Side Diff: examples/wm_flow/app/app.cc

Issue 818583002: Moves Create() off of View and onto ViewManager (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: merge 2 trunk Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « examples/window_manager/window_manager.cc ('k') | examples/wm_flow/wm/frame_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 virtual void OnEmbed( 84 virtual void OnEmbed(
85 mojo::View* root, 85 mojo::View* root,
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(root->view_manager()); 94 mojo::View* embed = root->view_manager()->CreateView();
95 root->AddChild(embed); 95 root->AddChild(embed);
96 mojo::Rect bounds; 96 mojo::Rect bounds;
97 bounds.x = bounds.y = 25; 97 bounds.x = bounds.y = 25;
98 bounds.width = root->bounds().width - 50; 98 bounds.width = root->bounds().width - 50;
99 bounds.height = root->bounds().height - 50; 99 bounds.height = root->bounds().height - 50;
100 embed->SetBounds(bounds); 100 embed->SetBounds(bounds);
101 embed->SetVisible(true); 101 embed->SetVisible(true);
102 102
103 scoped_ptr<mojo::ServiceProviderImpl> registry( 103 scoped_ptr<mojo::ServiceProviderImpl> registry(
104 new mojo::ServiceProviderImpl); 104 new mojo::ServiceProviderImpl);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 148
149 DISALLOW_COPY_AND_ASSIGN(WMFlowApp); 149 DISALLOW_COPY_AND_ASSIGN(WMFlowApp);
150 }; 150 };
151 151
152 } // namespace examples 152 } // namespace examples
153 153
154 MojoResult MojoMain(MojoHandle shell_handle) { 154 MojoResult MojoMain(MojoHandle shell_handle) {
155 mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp); 155 mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp);
156 return runner.Run(shell_handle); 156 return runner.Run(shell_handle);
157 } 157 }
OLDNEW
« no previous file with comments | « examples/window_manager/window_manager.cc ('k') | examples/wm_flow/wm/frame_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698