Nukes ViewManager arg from ViewManagerDelegate::OnEmbed

examples/window_manager/window_manager.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 "base/bind.h"
 #include "base/macros.h"
 #include "examples/keyboard/keyboard.mojom.h"
 #include "examples/window_manager/debug_panel.h"
 #include "examples/window_manager/window_manager.mojom.h"
 #include "mojo/application/application_runner_chromium.h"
@@ skipping 328 matching lines @@
   }
 
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) override {
     connection->AddService(&window_manager_factory_);
     window_manager_app_->ConfigureIncomingConnection(connection);
     return true;
   }
 
   // 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);
     Rect rect;
     rect.width = root->bounds().width;
     rect.height = root->bounds().height;
     view->SetBounds(rect);
     view->SetVisible(true);
     content_view_id_ = view->id();
 
     Id launcher_ui_id = CreateLauncherUI();
     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
     // PreTargetHandler to the window() here. We probably have to do something
     // analogous here.
 
     window_manager_app_->InitFocus(
         make_scoped_ptr(new window_manager::BasicFocusRules(view)));
   }
   virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {
@@ skipping 166 matching lines @@
   window_manager_->RequestNavigate(view_id_, target, request.Pass());
 }
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::WindowManager);
   return runner.Run(shell_handle);
 }