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

Unified Diff: examples/nesting_app/nesting_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/media_viewer/media_viewer.cc ('k') | examples/pdf_viewer/pdf_viewer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/nesting_app/nesting_app.cc
diff --git a/examples/nesting_app/nesting_app.cc b/examples/nesting_app/nesting_app.cc
index e7ae7f03e68c9462ce9b43fba8fabf3fd6adb26d..d8ca8a5ed9524bdb3ddd683e3c80de746dc2d1f8 100644
--- a/examples/nesting_app/nesting_app.cc
+++ b/examples/nesting_app/nesting_app.cc
@@ -59,8 +59,7 @@ class NestingApp
}
// Overridden from ViewManagerDelegate:
- virtual void OnEmbed(ViewManager* view_manager,
- View* root,
+ virtual void OnEmbed(View* root,
ServiceProviderImpl* exported_services,
scoped_ptr<ServiceProvider> imported_services) override {
root->AddObserver(this);
@@ -68,7 +67,7 @@ class NestingApp
bitmap_uploader_->Init(shell_);
bitmap_uploader_->SetColor(SK_ColorCYAN);
- nested_ = View::Create(view_manager);
+ nested_ = View::Create(root->view_manager());
root->AddChild(nested_);
Rect rect;
rect.x = rect.y = 20;
« no previous file with comments | « examples/media_viewer/media_viewer.cc ('k') | examples/pdf_viewer/pdf_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698