Nukes ViewManager arg from ViewManagerDelegate::OnEmbed

examples/keyboard/keyboard.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/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "examples/keyboard/keyboard.mojom.h"
 #include "examples/keyboard/keyboard_delegate.h"
 #include "examples/keyboard/keyboard_view.h"
@@ skipping 35 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(KeyboardServiceImpl);
 };
 
 class Keyboard : public ApplicationDelegate,
                  public ViewManagerDelegate,
                  public KeyboardDelegate {
  public:
   Keyboard()
       : shell_(nullptr),
         keyboard_service_factory_(this),
-        view_manager_(NULL),
         keyboard_service_(NULL),
         target_(0) {}
 
   virtual ~Keyboard() {
   }
 
   void set_target(Id id) { target_ = id; }
 
   void set_keyboard_service(KeyboardServiceImpl* keyboard) {
     keyboard_service_ = keyboard;
@@ skipping 24 matching lines @@
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.native_widget = new NativeWidgetViewManager(widget, shell_, view);
     params.delegate = widget_delegate;
     params.bounds = gfx::Rect(view->bounds().width, view->bounds().height);
     widget->Init(params);
     widget->Show();
   }
 
   // ViewManagerDelegate:
-  virtual void OnEmbed(ViewManager* view_manager,
-                       View* root,
+  virtual void OnEmbed(View* root,
                        ServiceProviderImpl* exported_services,
                        scoped_ptr<ServiceProvider> imported_services) override {
     // TODO: deal with OnEmbed() being invoked multiple times.
-    view_manager_ = view_manager;
     CreateWidget(root);
   }
   virtual void OnViewManagerDisconnected(
       ViewManager* view_manager) override {
-    DCHECK_EQ(view_manager_, view_manager);
-    view_manager_ = NULL;
     base::MessageLoop::current()->Quit();
   }
 
   // KeyboardDelegate:
   virtual void OnKeyPressed(int key_code, int event_flags) override {
     if (!target_)
       return;
     keyboard_service_->client()->OnKeyboardEvent(target_, key_code,
                                                  event_flags);
   }
 
   Shell* shell_;
 
   InterfaceFactoryImplWithContext<KeyboardServiceImpl, Keyboard>
       keyboard_service_factory_;
 
   scoped_ptr<ViewsInit> views_init_;
 
-  ViewManager* view_manager_;
   scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
 
   KeyboardServiceImpl* keyboard_service_;
 
   Id target_;
 
   DISALLOW_COPY_AND_ASSIGN(Keyboard);
 };
 
 KeyboardServiceImpl::KeyboardServiceImpl(Keyboard* keyboard)
     : keyboard_(keyboard) {
   keyboard_->set_keyboard_service(this);
 }
 
 void KeyboardServiceImpl::SetTarget(uint32_t view_id) {
   keyboard_->set_target(view_id);
 }
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::Keyboard);
   return runner.Run(shell_handle);
 }