| 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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 #include "media/media_features.h" | 188 #include "media/media_features.h" |
| 189 #include "net/base/mime_util.h" | 189 #include "net/base/mime_util.h" |
| 190 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 190 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
| 191 #include "net/cookies/canonical_cookie.h" | 191 #include "net/cookies/canonical_cookie.h" |
| 192 #include "net/cookies/cookie_options.h" | 192 #include "net/cookies/cookie_options.h" |
| 193 #include "net/ssl/ssl_cert_request_info.h" | 193 #include "net/ssl/ssl_cert_request_info.h" |
| 194 #include "ppapi/features/features.h" | 194 #include "ppapi/features/features.h" |
| 195 #include "ppapi/host/ppapi_host.h" | 195 #include "ppapi/host/ppapi_host.h" |
| 196 #include "printing/features/features.h" | 196 #include "printing/features/features.h" |
| 197 #include "services/image_decoder/public/interfaces/constants.mojom.h" | 197 #include "services/image_decoder/public/interfaces/constants.mojom.h" |
| 198 #include "services/pdf_compositor/public/interfaces/constants.mojom.h" |
| 198 #include "services/preferences/public/interfaces/preferences.mojom.h" | 199 #include "services/preferences/public/interfaces/preferences.mojom.h" |
| 199 #include "services/service_manager/public/cpp/interface_provider.h" | 200 #include "services/service_manager/public/cpp/interface_provider.h" |
| 200 #include "services/service_manager/public/cpp/interface_registry.h" | 201 #include "services/service_manager/public/cpp/interface_registry.h" |
| 201 #include "services/service_manager/public/cpp/service.h" | 202 #include "services/service_manager/public/cpp/service.h" |
| 202 #include "storage/browser/fileapi/external_mount_points.h" | 203 #include "storage/browser/fileapi/external_mount_points.h" |
| 203 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h" | 204 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h" |
| 204 #include "ui/base/l10n/l10n_util.h" | 205 #include "ui/base/l10n/l10n_util.h" |
| 205 #include "ui/base/resource/resource_bundle.h" | 206 #include "ui/base/resource/resource_bundle.h" |
| 206 #include "ui/resources/grit/ui_resources.h" | 207 #include "ui/resources/grit/ui_resources.h" |
| 207 #include "url/gurl.h" | 208 #include "url/gurl.h" |
| (...skipping 2913 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3121 } | 3122 } |
| 3122 | 3123 |
| 3123 void ChromeContentBrowserClient::RegisterOutOfProcessServices( | 3124 void ChromeContentBrowserClient::RegisterOutOfProcessServices( |
| 3124 OutOfProcessServiceMap* services) { | 3125 OutOfProcessServiceMap* services) { |
| 3125 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) | 3126 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) |
| 3126 services->insert(std::make_pair("media", | 3127 services->insert(std::make_pair("media", |
| 3127 base::ASCIIToUTF16("Media Service"))); | 3128 base::ASCIIToUTF16("Media Service"))); |
| 3128 #endif | 3129 #endif |
| 3129 services->insert(std::make_pair(image_decoder::mojom::kServiceName, | 3130 services->insert(std::make_pair(image_decoder::mojom::kServiceName, |
| 3130 base::ASCIIToUTF16("Image Decoder Service"))); | 3131 base::ASCIIToUTF16("Image Decoder Service"))); |
| 3132 services->insert( |
| 3133 std::make_pair(pdf_compositor::mojom::kServiceName, |
| 3134 base::ASCIIToUTF16("PDF Compositor Service"))); |
| 3131 } | 3135 } |
| 3132 | 3136 |
| 3133 std::unique_ptr<base::Value> | 3137 std::unique_ptr<base::Value> |
| 3134 ChromeContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) { | 3138 ChromeContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) { |
| 3135 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 3139 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 3136 int id = -1; | 3140 int id = -1; |
| 3137 if (name == content::mojom::kBrowserServiceName) | 3141 if (name == content::mojom::kBrowserServiceName) |
| 3138 id = IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY; | 3142 id = IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY; |
| 3139 else if (name == content::mojom::kGpuServiceName) | 3143 else if (name == content::mojom::kGpuServiceName) |
| 3140 id = IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY; | 3144 id = IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY; |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3434 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 3438 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
| 3435 return variations::GetVariationParamValue( | 3439 return variations::GetVariationParamValue( |
| 3436 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; | 3440 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; |
| 3437 } | 3441 } |
| 3438 | 3442 |
| 3439 // static | 3443 // static |
| 3440 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( | 3444 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( |
| 3441 const storage::QuotaSettings* settings) { | 3445 const storage::QuotaSettings* settings) { |
| 3442 g_default_quota_settings = settings; | 3446 g_default_quota_settings = settings; |
| 3443 } | 3447 } |
| OLD | NEW |