Nukes ViewManager arg from ViewManagerDelegate::OnEmbed

examples/browser/browser.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/window_manager/window_manager.mojom.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/common_type_converters.h"
@@ skipping 136 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(KeyboardManager);
 };
 
 // This is the basics of creating a views widget with a textfield.
 // TODO: cleanup!
 class Browser : public ApplicationDelegate,
                 public ViewManagerDelegate,
                 public views::TextfieldController,
                 public ViewObserver {
  public:
-  Browser()
-      : shell_(nullptr), view_manager_(NULL), root_(NULL), widget_(NULL) {}
+  Browser() : shell_(nullptr), root_(NULL), widget_(NULL) {}
 
   virtual ~Browser() {
     if (root_)
       root_->RemoveObserver(this);
   }
 
  private:
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) override {
     shell_ = app->shell();
@@ skipping 27 matching lines @@
     params.delegate = widget_delegate;
     params.bounds = gfx::Rect(view->bounds().width, view->bounds().height);
     widget_->Init(params);
     // KeyboardManager handles deleting itself when the widget is destroyed.
     new KeyboardManager(widget_, window_manager_.get(), view);
     widget_->Show();
     textfield->RequestFocus();
   }
 
   // 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.
     ConnectToService(imported_services.get(), &navigator_host_);
-    view_manager_ = view_manager;
     root_ = root;
     root_->AddObserver(this);
     root_->SetFocus();
     CreateWidget(root_);
   }
   virtual void OnViewManagerDisconnected(
       ViewManager* view_manager) override {
-    DCHECK_EQ(view_manager_, view_manager);
-    view_manager_ = NULL;
     base::MessageLoop::current()->Quit();
   }
 
   // views::TextfieldController:
   virtual bool HandleKeyEvent(views::Textfield* sender,
                               const ui::KeyEvent& key_event) override {
     if (key_event.key_code() == ui::VKEY_RETURN) {
       GURL url(sender->text());
       if (!url.is_valid()) {
         LOG(ERROR) << "Not a valid URL: " << sender->text();
@@ skipping 20 matching lines @@
   virtual void OnViewDestroyed(View* view) override {
     DCHECK_EQ(root_, view);
     view->RemoveObserver(this);
     root_ = NULL;
   }
 
   Shell* shell_;
 
   scoped_ptr<ViewsInit> views_init_;
 
-  ViewManager* view_manager_;
   scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
   View* root_;
   views::Widget* widget_;
   NavigatorHostPtr navigator_host_;
   IWindowManagerPtr window_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::Browser);
   return runner.Run(shell_handle);
 }