Index: components/font_service/public/cpp/font_loader.cc |
diff --git a/components/font_service/public/cpp/font_loader.cc b/components/font_service/public/cpp/font_loader.cc |
index 8b6338481f54cde63cd87cbf6e3da2b9e555e0f6..5a1e8f537cc2ed439801b9c20998169d3efb8a04 100644 |
--- a/components/font_service/public/cpp/font_loader.cc |
+++ b/components/font_service/public/cpp/font_loader.cc |
@@ -6,9 +6,25 @@ |
#include "components/font_service/public/cpp/font_service_thread.h" |
#include "mojo/application/public/cpp/application_impl.h" |
+#include "mojo/application/public/cpp/connect.h" |
+#include "mojo/application/public/interfaces/shell.mojom.h" |
namespace font_service { |
+FontLoader::FontLoader(mojo::Shell* shell) { |
+ mojo::ServiceProviderPtr font_service_provider; |
+ mojo::URLRequestPtr request(mojo::URLRequest::New()); |
+ request->url = mojo::String::From("mojo:font_service"); |
+ FontServicePtr font_service; |
+ shell->ConnectToApplication(request.Pass(), |
+ GetProxy(&font_service_provider), |
+ nullptr, |
+ nullptr); |
+ mojo::ConnectToService(font_service_provider.get(), &font_service); |
+ |
+ thread_ = new internal::FontServiceThread(font_service.Pass()); |
+} |
+ |
FontLoader::FontLoader(mojo::ApplicationImpl* application_impl) { |
mojo::URLRequestPtr request(mojo::URLRequest::New()); |
request->url = mojo::String::From("mojo:font_service"); |