Nukes ViewManager arg from ViewManagerDelegate::OnEmbed

examples/wm_flow/wm/wm.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 <vector>
 
 #include "examples/wm_flow/wm/frame_controller.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
@@ skipping 11 matching lines @@
 namespace examples {
 
 class SimpleWM : public mojo::ApplicationDelegate,
                  public mojo::ViewManagerDelegate,
                  public window_manager::WindowManagerDelegate,
                  public mojo::ViewObserver {
  public:
   SimpleWM()
       : shell_(nullptr),
         window_manager_app_(new window_manager::WindowManagerApp(this, this)),
-        view_manager_(NULL),
         root_(NULL),
         window_container_(NULL),
         next_window_origin_(10, 10) {}
   virtual ~SimpleWM() {}
 
  private:
   // Overridden from mojo::ApplicationDelegate:
   virtual void Initialize(mojo::ApplicationImpl* impl) override {
     // Create views_init here as we need ApplicationRunnerChromium to install
     // an AtExitManager and CommandLine.
     if (!views_init_.get())
       views_init_.reset(new mojo::ViewsInit);
     shell_ = impl->shell();
     window_manager_app_->Initialize(impl);
   }
   virtual bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
     window_manager_app_->ConfigureIncomingConnection(connection);
     return true;
   }
 
   // Overridden from mojo::ViewManagerDelegate:
   virtual void OnEmbed(
-      mojo::ViewManager* view_manager,
       mojo::View* root,
       mojo::ServiceProviderImpl* exported_services,
       scoped_ptr<mojo::ServiceProvider> remote_service_provider) override {
-    view_manager_ = view_manager;
     root_ = root;
 
-    window_container_ = mojo::View::Create(view_manager_);
+    window_container_ = mojo::View::Create(root->view_manager());
     window_container_->SetBounds(root_->bounds());
     root_->AddChild(window_container_);
     window_container_->SetVisible(true);
 
     window_manager_app_->InitFocus(make_scoped_ptr(
         new window_manager::BasicFocusRules(window_container_)));
   }
   virtual void OnViewManagerDisconnected(
       mojo::ViewManager* view_manager) override {
-    view_manager_ = NULL;
     root_ = NULL;
   }
 
   // Overridden from mojo::WindowManagerDelegate:
   virtual void Embed(
       const mojo::String& url,
       mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) override {
-    DCHECK(view_manager_);
+    DCHECK(root_);
     mojo::View* app_view = NULL;
     CreateTopLevelWindow(&app_view);
 
     // TODO(beng): We're dropping the |service_provider| passed from the client
     //             on the floor here and passing our own. Seems like we should
     //             be sending both. I'm not yet sure how this sould work for
     //             N levels of proxying.
     app_view->Embed(url, scoped_ptr<mojo::ServiceProviderImpl>(
         new mojo::ServiceProviderImpl).Pass());
   }
@@ skipping 12 matching lines @@
   }
 
   void CloseWindow(mojo::View* view) {
     mojo::View* first_child = view->children().front();
     first_child->Destroy();
     view->Destroy();
     next_window_origin_.Offset(-50, -50);
   }
 
   mojo::View* CreateTopLevelWindow(mojo::View** app_view) {
-    mojo::View* frame_view = mojo::View::Create(view_manager_);
+    mojo::View* frame_view = mojo::View::Create(root_->view_manager());
     // Add the View to it's parent before showing so that animations can happen.
     window_container_->AddChild(frame_view);
     mojo::Rect rect;
     rect.x = next_window_origin_.x();
     rect.y = next_window_origin_.y();
     rect.width = rect.height = 400;
     frame_view->SetBounds(rect);
     next_window_origin_.Offset(50, 50);
 
     new FrameController(
         shell_, frame_view, app_view, window_manager_app_.get());
     return frame_view;
   }
 
   mojo::Shell* shell_;
 
   scoped_ptr<mojo::ViewsInit> views_init_;
 
   scoped_ptr<window_manager::WindowManagerApp> window_manager_app_;
 
-  mojo::ViewManager* view_manager_;
   mojo::View* root_;
   mojo::View* window_container_;
 
   gfx::Point next_window_origin_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleWM);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new examples::SimpleWM);
   return runner.Run(shell_handle);
 }