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

Unified Diff: mojo/examples/wm_flow/app/app.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/window_manager/window_manager.cc ('k') | mojo/examples/wm_flow/embedded/embedded.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/wm_flow/app/app.cc
diff --git a/mojo/examples/wm_flow/app/app.cc b/mojo/examples/wm_flow/app/app.cc
index 9edd47e84913860196b0d5fb1c323ba7391837db..50668f37e27fc2e9b11dfe6c07b12648e7311d74 100644
--- a/mojo/examples/wm_flow/app/app.cc
+++ b/mojo/examples/wm_flow/app/app.cc
@@ -12,7 +12,7 @@
#include "mojo/public/cpp/application/interface_factory_impl.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/public/cpp/view_manager/node.h"
+#include "mojo/services/public/cpp/view_manager/view.h"
#include "mojo/services/public/cpp/view_manager/view_manager.h"
#include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
#include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
@@ -43,7 +43,7 @@ class EmbedderImpl : public mojo::InterfaceImpl<Embedder> {
// This app starts its life via Connect() rather than by being embed, so it does
// not start with a connection to the ViewManager service. It has to obtain a
// connection by connecting to the ViewManagerInit service and asking to be
-// embed without a node context.
+// embed without a view context.
class WMFlowApp : public mojo::ApplicationDelegate,
public mojo::ViewManagerDelegate {
public:
@@ -71,12 +71,12 @@ class WMFlowApp : 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> imported_services) MOJO_OVERRIDE {
root->SetColor(kColors[embed_count_++ % arraysize(kColors)]);
- mojo::Node* embed = mojo::Node::Create(view_manager);
+ mojo::View* embed = mojo::View::Create(view_manager);
root->AddChild(embed);
gfx::Rect bounds = root->bounds();
bounds.Inset(25, 25);
« no previous file with comments | « mojo/examples/window_manager/window_manager.cc ('k') | mojo/examples/wm_flow/embedded/embedded.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698