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

Unified Diff: mojo/examples/wm_flow/wm/wm.cc

Issue 460863002: Rename Node to View in the View Manager mojom & client lib. Service TBD. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/examples/wm_flow/embedded/embedded.cc ('k') | mojo/mojo_services.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/wm_flow/wm/wm.cc
diff --git a/mojo/examples/wm_flow/wm/wm.cc b/mojo/examples/wm_flow/wm/wm.cc
index bbd99114375bb49304d7ee6dd6f442adce6cbdd0..1832e360ff989229564aa74be0fa06fe62781b8c 100644
--- a/mojo/examples/wm_flow/wm/wm.cc
+++ b/mojo/examples/wm_flow/wm/wm.cc
@@ -37,14 +37,14 @@ class SimpleWM : public mojo::ApplicationDelegate,
// Overridden from mojo::ViewManagerDelegate:
virtual void OnEmbed(
mojo::ViewManager* view_manager,
- mojo::Node* root,
+ mojo::View* root,
mojo::ServiceProviderImpl* exported_services,
scoped_ptr<mojo::ServiceProvider> remote_service_provider) MOJO_OVERRIDE {
view_manager_ = view_manager;
root_ = root;
view_manager_->SetWindowManagerDelegate(this);
- window_container_ = mojo::Node::Create(view_manager_);
+ window_container_ = mojo::View::Create(view_manager_);
window_container_->SetBounds(root_->bounds());
root_->AddChild(window_container_);
@@ -60,20 +60,19 @@ class SimpleWM : public mojo::ApplicationDelegate,
const mojo::String& url,
mojo::InterfaceRequest<mojo::ServiceProvider> service_provider)
MOJO_OVERRIDE {
- mojo::Node* embed_node =
- mojo::Node::Create(view_manager_);
- embed_node->SetBounds(gfx::Rect(next_window_origin_, gfx::Size(400, 400)));
- window_container_->AddChild(embed_node);
+ mojo::View* embed_view = mojo::View::Create(view_manager_);
+ embed_view->SetBounds(gfx::Rect(next_window_origin_, gfx::Size(400, 400)));
+ window_container_->AddChild(embed_view);
// TODO(beng): We're dropping the |service_provider| passed from the client
// on the floor here and passing our own. Seems like we should
// be sending both. I'm not yet sure how this sould work for
// N levels of proxying.
- embed_node->Embed(url, scoped_ptr<mojo::ServiceProviderImpl>(
+ embed_view->Embed(url, scoped_ptr<mojo::ServiceProviderImpl>(
new mojo::ServiceProviderImpl).Pass());
next_window_origin_.Offset(50, 50);
}
- virtual void DispatchEvent(mojo::Node* target,
+ virtual void DispatchEvent(mojo::View* target,
mojo::EventPtr event) MOJO_OVERRIDE {
view_manager_->DispatchEvent(target, event.Pass());
}
@@ -81,8 +80,8 @@ class SimpleWM : public mojo::ApplicationDelegate,
scoped_ptr<mojo::WindowManagerApp> window_manager_app_;
mojo::ViewManager* view_manager_;
- mojo::Node* root_;
- mojo::Node* window_container_;
+ mojo::View* root_;
+ mojo::View* window_container_;
gfx::Point next_window_origin_;
« no previous file with comments | « mojo/examples/wm_flow/embedded/embedded.cc ('k') | mojo/mojo_services.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698