Adds GetDisplays() to WindowManager

components/resource_provider/public/cpp/resource_loader.cc

 // Copyright 2015 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 "components/resource_provider/public/cpp/resource_loader.h"
 
 #include "base/bind.h"
 #include "base/files/file.h"
+#include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/connect.h"
 #include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/platform_handle/platform_handle_functions.h"
 
 namespace resource_provider {
 namespace {
 base::File GetFileFromHandle(mojo::ScopedHandle handle) {
   CHECK(handle.is_valid());
   MojoPlatformHandle platform_handle;
   CHECK(MojoExtractPlatformHandle(handle.release().value(),
                                   &platform_handle) == MOJO_RESULT_OK);
   return base::File(platform_handle).Pass();
 }
 }
 
-ResourceLoader::ResourceLoader(mojo::Shell* shell,
+ResourceLoader::ResourceLoader(mojo::ApplicationImpl* app,
                                const std::set<std::string>& paths)
     : loaded_(false), did_block_(false) {
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From("mojo:resource_provider");
-  mojo::ServiceProviderPtr resource_provider_service_provider;
-  shell->ConnectToApplication(
-      request.Pass(), GetProxy(&resource_provider_service_provider), nullptr,
-      nullptr, mojo::Shell::ConnectToApplicationCallback());
-  mojo::ConnectToService(resource_provider_service_provider.get(),
-                         &resource_provider_);
+  app->ConnectToService(request.Pass(), &resource_provider_);
   std::vector<std::string> paths_vector(paths.begin(), paths.end());
   resource_provider_->GetResources(
       mojo::Array<mojo::String>::From(paths_vector),
       base::Bind(&ResourceLoader::OnGotResources, base::Unretained(this),
                  paths_vector));
 }
 
 ResourceLoader::~ResourceLoader() {
 }
 
@@ skipping 32 matching lines @@
         new base::File(GetFileFromHandle(resources[i].Pass())));
   }
   loaded_ = true;
 }
 
 void ResourceLoader::OnGotICU(base::File* file, mojo::ScopedHandle handle) {
   *file = GetFileFromHandle(handle.Pass());
 }
 
 }  // namespace resource_provider