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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
176 #include "device/usb/public/interfaces/chooser_service.mojom.h" | 176 #include "device/usb/public/interfaces/chooser_service.mojom.h" |
177 #include "device/usb/public/interfaces/device_manager.mojom.h" | 177 #include "device/usb/public/interfaces/device_manager.mojom.h" |
178 #include "gin/v8_initializer.h" | 178 #include "gin/v8_initializer.h" |
179 #include "net/base/mime_util.h" | 179 #include "net/base/mime_util.h" |
180 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 180 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
181 #include "net/cookies/canonical_cookie.h" | 181 #include "net/cookies/canonical_cookie.h" |
182 #include "net/cookies/cookie_options.h" | 182 #include "net/cookies/cookie_options.h" |
183 #include "net/ssl/ssl_cert_request_info.h" | 183 #include "net/ssl/ssl_cert_request_info.h" |
184 #include "ppapi/host/ppapi_host.h" | 184 #include "ppapi/host/ppapi_host.h" |
185 #include "printing/features/features.h" | 185 #include "printing/features/features.h" |
| 186 #include "services/image_decoder/public/cpp/constants.h" |
186 #include "services/service_manager/public/cpp/interface_provider.h" | 187 #include "services/service_manager/public/cpp/interface_provider.h" |
187 #include "services/service_manager/public/cpp/interface_registry.h" | 188 #include "services/service_manager/public/cpp/interface_registry.h" |
188 #include "services/service_manager/public/cpp/service.h" | 189 #include "services/service_manager/public/cpp/service.h" |
189 #include "storage/browser/fileapi/external_mount_points.h" | 190 #include "storage/browser/fileapi/external_mount_points.h" |
190 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h" | 191 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h" |
191 #include "ui/base/l10n/l10n_util.h" | 192 #include "ui/base/l10n/l10n_util.h" |
192 #include "ui/base/resource/resource_bundle.h" | 193 #include "ui/base/resource/resource_bundle.h" |
193 #include "ui/resources/grit/ui_resources.h" | 194 #include "ui/resources/grit/ui_resources.h" |
194 #include "url/gurl.h" | 195 #include "url/gurl.h" |
195 #include "url/origin.h" | 196 #include "url/origin.h" |
(...skipping 2809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3005 base::MakeUnique<chromeos::ChromeInterfaceFactory>()); | 3006 base::MakeUnique<chromeos::ChromeInterfaceFactory>()); |
3006 #endif // OS_CHROMEOS | 3007 #endif // OS_CHROMEOS |
3007 } | 3008 } |
3008 | 3009 |
3009 void ChromeContentBrowserClient::RegisterOutOfProcessServices( | 3010 void ChromeContentBrowserClient::RegisterOutOfProcessServices( |
3010 OutOfProcessServiceMap* services) { | 3011 OutOfProcessServiceMap* services) { |
3011 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) | 3012 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) |
3012 services->insert(std::make_pair("service:media", | 3013 services->insert(std::make_pair("service:media", |
3013 base::ASCIIToUTF16("Media Service"))); | 3014 base::ASCIIToUTF16("Media Service"))); |
3014 #endif | 3015 #endif |
| 3016 services->insert(std::make_pair(image_decoder::kServiceName, |
| 3017 base::ASCIIToUTF16("Image Decoder Service"))); |
3015 } | 3018 } |
3016 | 3019 |
3017 std::unique_ptr<base::Value> | 3020 std::unique_ptr<base::Value> |
3018 ChromeContentBrowserClient::GetServiceManifestOverlay( | 3021 ChromeContentBrowserClient::GetServiceManifestOverlay( |
3019 const std::string& name) { | 3022 const std::string& name) { |
3020 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 3023 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
3021 int id = -1; | 3024 int id = -1; |
3022 if (name == content::kBrowserServiceName) | 3025 if (name == content::kBrowserServiceName) |
3023 id = IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY; | 3026 id = IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY; |
3024 else if (name == content::kGpuServiceName) | 3027 else if (name == content::kGpuServiceName) |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3234 kWebRtcDevSwitchNames, | 3237 kWebRtcDevSwitchNames, |
3235 arraysize(kWebRtcDevSwitchNames)); | 3238 arraysize(kWebRtcDevSwitchNames)); |
3236 } | 3239 } |
3237 } | 3240 } |
3238 #endif // defined(ENABLE_WEBRTC) | 3241 #endif // defined(ENABLE_WEBRTC) |
3239 | 3242 |
3240 std::unique_ptr<content::MemoryCoordinatorDelegate> | 3243 std::unique_ptr<content::MemoryCoordinatorDelegate> |
3241 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() { | 3244 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() { |
3242 return memory::ChromeMemoryCoordinatorDelegate::Create(); | 3245 return memory::ChromeMemoryCoordinatorDelegate::Create(); |
3243 } | 3246 } |
OLD | NEW |