Nukes ViewManager arg from ViewManagerDelegate::OnEmbed

examples/media_viewer/media_viewer.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 <map>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 180 matching lines @@
 
 class MediaViewer
     : public ApplicationDelegate,
       public ViewManagerDelegate,
       public ControlPanel::Delegate,
       public ViewObserver {
  public:
   MediaViewer()
       : shell_(nullptr),
         app_(NULL),
-        view_manager_(NULL),
         root_view_(NULL),
         control_view_(NULL),
         content_view_(NULL),
         control_panel_(this) {
     handler_map_["image/png"] = "mojo:png_viewer";
   }
 
   virtual ~MediaViewer() {
     if (root_view_)
       root_view_->RemoveObserver(this);
@@ skipping 25 matching lines @@
     control_bounds.height = 28;
     control_view_->SetBounds(control_bounds);
     Rect content_bounds;
     content_bounds.y = control_bounds.height;
     content_bounds.width = root->bounds().width;
     content_bounds.height = root->bounds().height - control_bounds.height;
     content_view_->SetBounds(content_bounds);
   }
 
   // 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_view_ = root;
-    view_manager_ = view_manager;
 
-    control_view_ = View::Create(view_manager_);
+    control_view_ = View::Create(root->view_manager());
     control_view_->SetVisible(true);
     root_view_->AddChild(control_view_);
 
-    content_view_ = View::Create(view_manager_);
+    content_view_ = View::Create(root->view_manager());
     content_view_->SetVisible(true);
     root_view_->AddChild(content_view_);
 
     control_panel_.Initialize(control_view_, shell_);
 
     LayoutViews();
     root_view_->AddObserver(this);
 
     content_view_->Embed("TODO");
   }
 
   virtual void OnViewManagerDisconnected(
       ViewManager* view_manager) override {
-    DCHECK_EQ(view_manager_, view_manager);
-    view_manager_ = NULL;
     base::MessageLoop::current()->Quit();
   }
 
   // Overridden from ControlPanel::Delegate:
   virtual void ButtonPressed(ControlPanel::ControlType type) override {
     switch (type) {
       case ControlPanel::CONTROL_ZOOM_IN:
         zoomable_media_->ZoomIn();
         break;
       case ControlPanel::CONTROL_ACTUAL_SIZE:
@@ skipping 23 matching lines @@
     HandlerMap::const_iterator it = handler_map_.find(content_type);
     return it != handler_map_.end() ? it->second : std::string();
   }
 
   Shell* shell_;
 
   scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
 
   ApplicationImpl* app_;
   scoped_ptr<ViewsInit> views_init_;
-  ViewManager* view_manager_;
   View* root_view_;
   View* control_view_;
   View* content_view_;
   ControlPanel control_panel_;
   ZoomableMediaPtr zoomable_media_;
   HandlerMap handler_map_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaViewer);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::MediaViewer);
   return runner.Run(shell_handle);
 }