diff --git a/engine/src/flutter/tools/debugger/debugger.cc b/engine/src/flutter/tools/debugger/debugger.cc index de931978cf..2a19cbbd6d 100644 --- a/engine/src/flutter/tools/debugger/debugger.cc +++ b/engine/src/flutter/tools/debugger/debugger.cc @@ -11,7 +11,6 @@ namespace debugger { SkyDebugger::SkyDebugger() : window_manager_app_(new window_manager::WindowManagerApp(this, nullptr)), - view_manager_(nullptr), root_(nullptr), content_(nullptr), navigator_host_factory_(this), @@ -45,18 +44,15 @@ bool SkyDebugger::ConfigureOutgoingConnection( } void SkyDebugger::OnEmbed( - mojo::ViewManager* view_manager, mojo::View* root, mojo::ServiceProviderImpl* exported_services, scoped_ptr imported_services) { - view_manager_ = view_manager; - root_ = root; root_->AddObserver(this); window_manager_app_->SetViewportSize(gfx::Size(320, 640)); - content_ = mojo::View::Create(view_manager_); + content_ = mojo::View::Create(root->view_manager()); content_->SetBounds(root_->bounds()); root_->AddChild(content_); content_->SetVisible(true); @@ -69,7 +65,6 @@ void SkyDebugger::OnEmbed( } void SkyDebugger::OnViewManagerDisconnected(mojo::ViewManager* view_manager) { - view_manager_ = nullptr; root_ = nullptr; } diff --git a/engine/src/flutter/tools/debugger/debugger.h b/engine/src/flutter/tools/debugger/debugger.h index adedf219ca..69e564ba26 100644 --- a/engine/src/flutter/tools/debugger/debugger.h +++ b/engine/src/flutter/tools/debugger/debugger.h @@ -46,8 +46,7 @@ class SkyDebugger : public mojo::ApplicationDelegate, mojo::ApplicationConnection* connection) override; // Overridden from mojo::ViewManagerDelegate: - void OnEmbed(mojo::ViewManager* view_manager, - mojo::View* root, + void OnEmbed(mojo::View* root, mojo::ServiceProviderImpl* exported_services, scoped_ptr imported_services) override; void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override; @@ -64,7 +63,6 @@ class SkyDebugger : public mojo::ApplicationDelegate, scoped_ptr window_manager_app_; - mojo::ViewManager* view_manager_; mojo::View* root_; mojo::View* content_; std::string pending_url_; diff --git a/engine/src/flutter/tools/tester/tester.cc b/engine/src/flutter/tools/tester/tester.cc index 4ee889ee06..c816d006c9 100644 --- a/engine/src/flutter/tools/tester/tester.cc +++ b/engine/src/flutter/tools/tester/tester.cc @@ -61,7 +61,6 @@ class SkyTester : public mojo::ApplicationDelegate, public: SkyTester() : window_manager_app_(new window_manager::WindowManagerApp(this, this)), - view_manager_(NULL), root_(NULL), content_(NULL), weak_ptr_factory_(this) {} @@ -85,15 +84,13 @@ class SkyTester : public mojo::ApplicationDelegate, // Overridden from mojo::ViewManagerDelegate: virtual void OnEmbed( - mojo::ViewManager* view_manager, mojo::View* root, mojo::ServiceProviderImpl* exported_services, scoped_ptr remote_service_provider) override { - view_manager_ = view_manager; root_ = root; root_->AddObserver(this); - content_ = mojo::View::Create(view_manager_); + content_ = mojo::View::Create(root->view_manager()); content_->SetBounds(root_->bounds()); root_->AddChild(content_); content_->SetVisible(true); @@ -111,7 +108,6 @@ class SkyTester : public mojo::ApplicationDelegate, virtual void OnViewManagerDisconnected( mojo::ViewManager* view_manager) override { - view_manager_ = NULL; root_ = NULL; } @@ -159,7 +155,6 @@ class SkyTester : public mojo::ApplicationDelegate, std::string url_from_args_; - mojo::ViewManager* view_manager_; mojo::View* root_; mojo::View* content_;