Update view_manager and window_manager to make use of content handling.

mojo/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 193 matching lines @@
 };
 
 class MediaViewer
     : public ApplicationDelegate,
       public ViewManagerDelegate,
       public ControlPanel::Delegate,
       public ViewObserver {
  public:
   MediaViewer()
       : navigator_factory_(this),
-        view_manager_client_factory_(this),
         app_(NULL),
         view_manager_(NULL),
         root_view_(NULL),
         control_view_(NULL),
         content_view_(NULL),
         control_panel_(this) {
     handler_map_["image/png"] = "mojo:mojo_png_viewer";
   }
 
   virtual ~MediaViewer() {
@@ skipping 39 matching lines @@
 
   struct PendingNavigateRequest {
     uint32_t view_id;
     NavigationDetailsPtr navigation_details;
     ResponseDetailsPtr response_details;
   };
 
 
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) OVERRIDE {
+    view_manager_client_factory_.reset(
+        new ViewManagerClientFactory(app->shell(), this));
     app_ = app;
     views_init_.reset(new ViewsInit);
   }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       OVERRIDE {
     connection->AddService(&navigator_factory_);
-    connection->AddService(&view_manager_client_factory_);
+    connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
   void LayoutViews() {
     View* root = content_view_->parent();
     gfx::Rect control_bounds(root->bounds().width(), 28);
     control_view_->SetBounds(control_bounds);
     gfx::Rect content_bounds(0, control_bounds.height(), root->bounds().width(),
                              root->bounds().height() - control_bounds.height());
     content_view_->SetBounds(content_bounds);
@@ skipping 62 matching lines @@
     root_view_ = NULL;
   }
 
   std::string GetHandlerForContentType(const std::string& content_type) {
     HandlerMap::const_iterator it = handler_map_.find(content_type);
     return it != handler_map_.end() ? it->second : std::string();
   }
 
   InterfaceFactoryImplWithContext<NavigatorImpl, MediaViewer>
       navigator_factory_;
-  ViewManagerClientFactory view_manager_client_factory_;
+  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_;
@@ skipping 10 matching lines @@
                     response_details.Pass());
 }
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::MediaViewer);
   return runner.Run(shell_handle);
 }