Update view_manager and window_manager to make use of content handling.

mojo/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/basictypes.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/c/system/main.h"
@@ skipping 137 matching lines @@
 
 // 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()
       : view_manager_(NULL),
-        view_manager_client_factory_(this),
         root_(NULL),
         widget_(NULL) {}
 
   virtual ~Browser() {
     if (root_)
       root_->RemoveObserver(this);
   }
 
  private:
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE {
+    view_manager_client_factory_.reset(
+        new ViewManagerClientFactory(app->shell(), this));
     views_init_.reset(new ViewsInit);
     app->ConnectToService("mojo:mojo_window_manager", &navigator_host_);
     app->ConnectToService("mojo:mojo_window_manager", &window_manager_);
  }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE {
-    connection->AddService(&view_manager_client_factory_);
+    connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
   void CreateWidget(View* view) {
     views::Textfield* textfield = new views::Textfield;
     textfield->set_controller(this);
 
     views::WidgetDelegateView* widget_delegate = new views::WidgetDelegateView;
     widget_delegate->GetContentsView()->set_background(
         views::Background::CreateSolidBackground(SK_ColorBLUE));
@@ skipping 60 matching lines @@
   }
   virtual void OnViewDestroyed(View* view) OVERRIDE {
     DCHECK_EQ(root_, view);
     view->RemoveObserver(this);
     root_ = NULL;
   }
 
   scoped_ptr<ViewsInit> views_init_;
 
   ViewManager* view_manager_;
-  ViewManagerClientFactory view_manager_client_factory_;
+  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);
 }