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

Unified Diff: examples/wm_flow/app/app.cc

Issue 815003002: Nukes ViewManager arg from ViewManagerDelegate::OnEmbed (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: format 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « examples/window_manager/window_manager.cc ('k') | examples/wm_flow/embedded/embedded.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/wm_flow/app/app.cc
diff --git a/examples/wm_flow/app/app.cc b/examples/wm_flow/app/app.cc
index 6da3a81fcbf51e59b9ccc25dc2f9ac881347e92f..39b5cb7ad55a2378401928d699bddac8a393face 100644
--- a/examples/wm_flow/app/app.cc
+++ b/examples/wm_flow/app/app.cc
@@ -82,7 +82,6 @@ class WMFlowApp : public mojo::ApplicationDelegate,
// Overridden from mojo::ViewManagerDelegate:
virtual void OnEmbed(
- mojo::ViewManager* view_manager,
mojo::View* root,
mojo::ServiceProviderImpl* exported_services,
scoped_ptr<mojo::ServiceProvider> imported_services) override {
@@ -92,7 +91,7 @@ class WMFlowApp : public mojo::ApplicationDelegate,
uploader->Init(shell_);
uploader->SetColor(kColors[embed_count_++ % arraysize(kColors)]);
- mojo::View* embed = mojo::View::Create(view_manager);
+ mojo::View* embed = mojo::View::Create(root->view_manager());
root->AddChild(embed);
mojo::Rect bounds;
bounds.x = bounds.y = 25;
« no previous file with comments | « examples/window_manager/window_manager.cc ('k') | examples/wm_flow/embedded/embedded.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698