Update view_manager and window_manager to make use of content handling.

mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.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 "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
-#include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
+#include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_private.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace mojo {
 
@@ skipping 85 matching lines @@
 
   result = MapBuffer(
       handle->get(), 0, size, memory, MOJO_MAP_BUFFER_FLAG_NONE);
   if (result != MOJO_RESULT_OK)
     return false;
   DCHECK(*memory);
 
   return true;
 }
 
-ViewManagerClientImpl::ViewManagerClientImpl(
-    ViewManagerDelegate* delegate,
-    ApplicationConnection* app_connection)
+ViewManagerClientImpl::ViewManagerClientImpl(ViewManagerDelegate* delegate,
+                                             Shell* shell)
     : connected_(false),
       connection_id_(0),
       next_id_(1),
       delegate_(delegate),
       window_manager_delegate_(NULL) {
   // TODO(beng): Come up with a better way of establishing a configuration for
   //             what the active window manager is.
   std::string window_manager_url = "mojo:mojo_window_manager";
   if (base::CommandLine::ForCurrentProcess()->HasSwitch("window-manager")) {
     window_manager_url =
         base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
             "window-manager");
   }
-  app_connection->ConnectToService(window_manager_url, &window_manager_);
+  InterfacePtr<ServiceProvider> sp;
+  shell->ConnectToApplication(window_manager_url, Get(&sp));
+  ConnectToService(sp.get(), &window_manager_);
   window_manager_.set_client(this);
 }
 
 ViewManagerClientImpl::~ViewManagerClientImpl() {
   std::vector<View*> non_owned;
   while (!views_.empty()) {
     IdToViewMap::iterator it = views_.begin();
     if (OwnsView(it->second->id())) {
       it->second->Destroy();
     } else {
@@ skipping 292 matching lines @@
                     base::Unretained(this));
 }
 
 base::Callback<void(ErrorCode)>
     ViewManagerClientImpl::ActionCompletedCallbackWithErrorCode() {
   return base::Bind(&ViewManagerClientImpl::OnActionCompletedWithErrorCode,
                     base::Unretained(this));
 }
 
 }  // namespace mojo