Nukes ViewManager arg from ViewManagerDelegate::OnEmbed

sky/tools/debugger/debugger.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sky/tools/debugger/debugger.h"
 
 #include "services/window_manager/basic_focus_rules.h"
 
 namespace sky {
 namespace debugger {
 
 SkyDebugger::SkyDebugger()
     : window_manager_app_(new window_manager::WindowManagerApp(this, nullptr)),
-      view_manager_(nullptr),
       root_(nullptr),
       content_(nullptr),
       navigator_host_factory_(this),
       weak_factory_(this) {
 }
 
 SkyDebugger::~SkyDebugger() {
 }
 
 base::WeakPtr<SkyDebugger> SkyDebugger::GetWeakPtr() {
@@ skipping 13 matching lines @@
 }
 
 bool SkyDebugger::ConfigureOutgoingConnection(
     mojo::ApplicationConnection* connection) {
   window_manager_app_->ConfigureOutgoingConnection(connection);
   connection->AddService(this);
   return true;
 }
 
 void SkyDebugger::OnEmbed(
-    mojo::ViewManager* view_manager,
     mojo::View* root,
     mojo::ServiceProviderImpl* exported_services,
     scoped_ptr<mojo::ServiceProvider> 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);
 
   window_manager_app_->InitFocus(
       make_scoped_ptr(new window_manager::BasicFocusRules(content_)));
 
   if (!pending_url_.empty())
     NavigateToURL(pending_url_);
 }
 
 void SkyDebugger::OnViewManagerDisconnected(mojo::ViewManager* view_manager) {
-  view_manager_ = nullptr;
   root_ = nullptr;
 }
 
 void SkyDebugger::OnViewDestroyed(mojo::View* view) {
   view->RemoveObserver(this);
 }
 
 void SkyDebugger::OnViewBoundsChanged(mojo::View* view,
                                       const mojo::Rect& old_bounds,
                                       const mojo::Rect& new_bounds) {
@@ skipping 33 matching lines @@
 }
 
 void SkyDebugger::InjectInspector() {
   InspectorServicePtr inspector_service;
   mojo::ConnectToService(viewer_services_.get(), &inspector_service);
   inspector_service->Inject();
 }
 
 }  // namespace debugger
 }  // namespace sky