| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/frame_host/frame_mojo_shell.h" | 5 #include "content/browser/frame_host/frame_mojo_shell.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "content/browser/mojo/mojo_shell_context.h" | 10 #include "content/browser/mojo/mojo_shell_context.h" |
| 11 #include "content/common/mojo/service_registry_impl.h" | 11 #include "content/common/mojo/service_registry_impl.h" |
| 12 #include "content/public/browser/content_browser_client.h" | 12 #include "content/public/browser/content_browser_client.h" |
| 13 #include "content/public/browser/render_frame_host.h" | 13 #include "content/public/browser/render_frame_host.h" |
| 14 #include "content/public/browser/render_process_host.h" | 14 #include "content/public/browser/render_process_host.h" |
| 15 #include "content/public/browser/site_instance.h" | 15 #include "content/public/browser/site_instance.h" |
| 16 #include "content/public/common/content_client.h" | 16 #include "content/public/common/content_client.h" |
| 17 #include "mojo/common/url_type_converters.h" | |
| 18 | 17 |
| 19 #if defined(OS_ANDROID) && defined(ENABLE_MOJO_CDM) | 18 #if defined(OS_ANDROID) && defined(ENABLE_MOJO_CDM) |
| 20 #include "content/browser/media/android/provision_fetcher_impl.h" | 19 #include "content/browser/media/android/provision_fetcher_impl.h" |
| 21 #endif | 20 #endif |
| 22 | 21 |
| 23 namespace content { | 22 namespace content { |
| 24 | 23 |
| 25 namespace { | 24 namespace { |
| 26 | 25 |
| 27 void RegisterFrameMojoShellServices(ServiceRegistry* registry, | 26 void RegisterFrameMojoShellServices(ServiceRegistry* registry, |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 // different services for different apps for better isolation. | 75 // different services for different apps for better isolation. |
| 77 RegisterFrameMojoShellServices(service_registry_.get(), frame_host_); | 76 RegisterFrameMojoShellServices(service_registry_.get(), frame_host_); |
| 78 GetContentClient()->browser()->RegisterFrameMojoShellServices( | 77 GetContentClient()->browser()->RegisterFrameMojoShellServices( |
| 79 service_registry_.get(), frame_host_); | 78 service_registry_.get(), frame_host_); |
| 80 } | 79 } |
| 81 | 80 |
| 82 return service_registry_.get(); | 81 return service_registry_.get(); |
| 83 } | 82 } |
| 84 | 83 |
| 85 } // namespace content | 84 } // namespace content |
| OLD | NEW |