OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 #include "chrome/browser/memory/chrome_memory_coordinator_delegate.h" | 54 #include "chrome/browser/memory/chrome_memory_coordinator_delegate.h" |
55 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" | 55 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" |
56 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 56 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
57 #include "chrome/browser/net_benchmarking.h" | 57 #include "chrome/browser/net_benchmarking.h" |
58 #include "chrome/browser/notifications/platform_notification_service_impl.h" | 58 #include "chrome/browser/notifications/platform_notification_service_impl.h" |
59 #include "chrome/browser/page_load_metrics/metrics_navigation_throttle.h" | 59 #include "chrome/browser/page_load_metrics/metrics_navigation_throttle.h" |
60 #include "chrome/browser/password_manager/chrome_password_manager_client.h" | 60 #include "chrome/browser/password_manager/chrome_password_manager_client.h" |
61 #include "chrome/browser/payments/payment_request_impl.h" | 61 #include "chrome/browser/payments/payment_request_impl.h" |
62 #include "chrome/browser/permissions/permission_context_base.h" | 62 #include "chrome/browser/permissions/permission_context_base.h" |
63 #include "chrome/browser/platform_util.h" | 63 #include "chrome/browser/platform_util.h" |
| 64 #include "chrome/browser/prefs/preferences_connection_manager.h" |
64 #include "chrome/browser/prerender/prerender_final_status.h" | 65 #include "chrome/browser/prerender/prerender_final_status.h" |
65 #include "chrome/browser/prerender/prerender_manager.h" | 66 #include "chrome/browser/prerender/prerender_manager.h" |
66 #include "chrome/browser/prerender/prerender_manager_factory.h" | 67 #include "chrome/browser/prerender/prerender_manager_factory.h" |
67 #include "chrome/browser/prerender/prerender_message_filter.h" | 68 #include "chrome/browser/prerender/prerender_message_filter.h" |
68 #include "chrome/browser/printing/printing_message_filter.h" | 69 #include "chrome/browser/printing/printing_message_filter.h" |
69 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" | 70 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" |
70 #include "chrome/browser/profiles/profile.h" | 71 #include "chrome/browser/profiles/profile.h" |
71 #include "chrome/browser/profiles/profile_io_data.h" | 72 #include "chrome/browser/profiles/profile_io_data.h" |
72 #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h" | 73 #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h" |
73 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" | 74 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
188 #include "media/media_features.h" | 189 #include "media/media_features.h" |
189 #include "net/base/mime_util.h" | 190 #include "net/base/mime_util.h" |
190 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 191 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
191 #include "net/cookies/canonical_cookie.h" | 192 #include "net/cookies/canonical_cookie.h" |
192 #include "net/cookies/cookie_options.h" | 193 #include "net/cookies/cookie_options.h" |
193 #include "net/ssl/ssl_cert_request_info.h" | 194 #include "net/ssl/ssl_cert_request_info.h" |
194 #include "ppapi/features/features.h" | 195 #include "ppapi/features/features.h" |
195 #include "ppapi/host/ppapi_host.h" | 196 #include "ppapi/host/ppapi_host.h" |
196 #include "printing/features/features.h" | 197 #include "printing/features/features.h" |
197 #include "services/image_decoder/public/interfaces/constants.mojom.h" | 198 #include "services/image_decoder/public/interfaces/constants.mojom.h" |
| 199 #include "services/preferences/public/interfaces/preferences.mojom.h" |
198 #include "services/service_manager/public/cpp/interface_provider.h" | 200 #include "services/service_manager/public/cpp/interface_provider.h" |
199 #include "services/service_manager/public/cpp/interface_registry.h" | 201 #include "services/service_manager/public/cpp/interface_registry.h" |
200 #include "services/service_manager/public/cpp/service.h" | 202 #include "services/service_manager/public/cpp/service.h" |
201 #include "storage/browser/fileapi/external_mount_points.h" | 203 #include "storage/browser/fileapi/external_mount_points.h" |
202 #include "third_party/WebKit/public/platform/modules/shapedetection/barcodedetec
tion.mojom.h" | 204 #include "third_party/WebKit/public/platform/modules/shapedetection/barcodedetec
tion.mojom.h" |
203 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h" | 205 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h" |
204 #include "ui/base/l10n/l10n_util.h" | 206 #include "ui/base/l10n/l10n_util.h" |
205 #include "ui/base/resource/resource_bundle.h" | 207 #include "ui/base/resource/resource_bundle.h" |
206 #include "ui/resources/grit/ui_resources.h" | 208 #include "ui/resources/grit/ui_resources.h" |
207 #include "url/gurl.h" | 209 #include "url/gurl.h" |
(...skipping 2870 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3078 void ChromeContentBrowserClient::RegisterInProcessServices( | 3080 void ChromeContentBrowserClient::RegisterInProcessServices( |
3079 StaticServiceMap* services) { | 3081 StaticServiceMap* services) { |
3080 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 3082 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
3081 content::ServiceInfo info; | 3083 content::ServiceInfo info; |
3082 info.factory = base::Bind(&media::CreateMediaService); | 3084 info.factory = base::Bind(&media::CreateMediaService); |
3083 services->insert(std::make_pair("media", info)); | 3085 services->insert(std::make_pair("media", info)); |
3084 #endif | 3086 #endif |
3085 #if defined(OS_CHROMEOS) | 3087 #if defined(OS_CHROMEOS) |
3086 content::ServiceManagerConnection::GetForProcess()->AddConnectionFilter( | 3088 content::ServiceManagerConnection::GetForProcess()->AddConnectionFilter( |
3087 base::MakeUnique<chromeos::ChromeInterfaceFactory>()); | 3089 base::MakeUnique<chromeos::ChromeInterfaceFactory>()); |
| 3090 { |
| 3091 content::ServiceInfo info; |
| 3092 info.factory = base::Bind([] { |
| 3093 return std::unique_ptr<service_manager::Service>( |
| 3094 base::MakeUnique<PreferencesConnectionManager>()); |
| 3095 }); |
| 3096 services->insert(std::make_pair(prefs::mojom::kServiceName, info)); |
| 3097 } |
3088 #endif // OS_CHROMEOS | 3098 #endif // OS_CHROMEOS |
3089 } | 3099 } |
3090 | 3100 |
3091 void ChromeContentBrowserClient::RegisterOutOfProcessServices( | 3101 void ChromeContentBrowserClient::RegisterOutOfProcessServices( |
3092 OutOfProcessServiceMap* services) { | 3102 OutOfProcessServiceMap* services) { |
3093 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) | 3103 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) |
3094 services->insert(std::make_pair("media", | 3104 services->insert(std::make_pair("media", |
3095 base::ASCIIToUTF16("Media Service"))); | 3105 base::ASCIIToUTF16("Media Service"))); |
3096 #endif | 3106 #endif |
3097 services->insert(std::make_pair(image_decoder::mojom::kServiceName, | 3107 services->insert(std::make_pair(image_decoder::mojom::kServiceName, |
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3368 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() { | 3378 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() { |
3369 return variations::GetVariationParamValue( | 3379 return variations::GetVariationParamValue( |
3370 "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true"; | 3380 "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true"; |
3371 } | 3381 } |
3372 | 3382 |
3373 bool ChromeContentBrowserClient:: | 3383 bool ChromeContentBrowserClient:: |
3374 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 3384 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
3375 return variations::GetVariationParamValue( | 3385 return variations::GetVariationParamValue( |
3376 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; | 3386 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; |
3377 } | 3387 } |
OLD | NEW |