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

Unified Diff: examples/window_manager/window_manager.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/sky_compositor_app/sky_compositor_app.cc ('k') | examples/wm_flow/app/app.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/window_manager/window_manager.cc
diff --git a/examples/window_manager/window_manager.cc b/examples/window_manager/window_manager.cc
index 16869018a89c070121c8eefc1e4a77b869b04acb..f81c532872fde060a5b75f629dacca32c0719a1e 100644
--- a/examples/window_manager/window_manager.cc
+++ b/examples/window_manager/window_manager.cc
@@ -346,12 +346,11 @@ class WindowManager : public ApplicationDelegate,
}
// 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 {
DCHECK(!view_manager_);
- view_manager_ = view_manager;
+ view_manager_ = root->view_manager();
View* view = View::Create(view_manager_);
root->AddChild(view);
@@ -366,10 +365,8 @@ class WindowManager : public ApplicationDelegate,
Id control_panel_id = CreateControlPanel(view);
root_layout_manager_.reset(
- new RootLayoutManager(view_manager, root,
- content_view_id_,
- launcher_ui_id,
- control_panel_id));
+ new RootLayoutManager(view_manager_, root, content_view_id_,
+ launcher_ui_id, control_panel_id));
root->AddObserver(root_layout_manager_.get());
// TODO(erg): In the aura version, we explicitly added ourselves as a
« no previous file with comments | « examples/sky_compositor_app/sky_compositor_app.cc ('k') | examples/wm_flow/app/app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698