Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2774463002: image_decoder service -> data_decoder service (Closed)
Patch Set: . Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/chrome_content_browser_manifest_overlay.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
188 #include "media/audio/audio_manager.h" 188 #include "media/audio/audio_manager.h"
189 #include "media/media_features.h" 189 #include "media/media_features.h"
190 #include "net/base/mime_util.h" 190 #include "net/base/mime_util.h"
191 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 191 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
192 #include "net/cookies/canonical_cookie.h" 192 #include "net/cookies/canonical_cookie.h"
193 #include "net/cookies/cookie_options.h" 193 #include "net/cookies/cookie_options.h"
194 #include "net/ssl/ssl_cert_request_info.h" 194 #include "net/ssl/ssl_cert_request_info.h"
195 #include "ppapi/features/features.h" 195 #include "ppapi/features/features.h"
196 #include "ppapi/host/ppapi_host.h" 196 #include "ppapi/host/ppapi_host.h"
197 #include "printing/features/features.h" 197 #include "printing/features/features.h"
198 #include "services/image_decoder/public/interfaces/constants.mojom.h"
199 #include "services/preferences/public/interfaces/preferences.mojom.h" 198 #include "services/preferences/public/interfaces/preferences.mojom.h"
200 #include "services/service_manager/public/cpp/interface_provider.h" 199 #include "services/service_manager/public/cpp/interface_provider.h"
201 #include "services/service_manager/public/cpp/interface_registry.h" 200 #include "services/service_manager/public/cpp/interface_registry.h"
202 #include "services/service_manager/public/cpp/service.h" 201 #include "services/service_manager/public/cpp/service.h"
203 #include "storage/browser/fileapi/external_mount_points.h" 202 #include "storage/browser/fileapi/external_mount_points.h"
204 #include "third_party/WebKit/public/platform/modules/installedapp/installed_app_ provider.mojom.h" 203 #include "third_party/WebKit/public/platform/modules/installedapp/installed_app_ provider.mojom.h"
205 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h" 204 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h"
206 #include "ui/base/l10n/l10n_util.h" 205 #include "ui/base/l10n/l10n_util.h"
207 #include "ui/base/resource/resource_bundle.h" 206 #include "ui/base/resource/resource_bundle.h"
208 #include "ui/resources/grit/ui_resources.h" 207 #include "ui/resources/grit/ui_resources.h"
(...skipping 3038 matching lines...) Expand 10 before | Expand all | Expand 10 after
3247 } 3246 }
3248 #endif // OS_CHROMEOS 3247 #endif // OS_CHROMEOS
3249 } 3248 }
3250 3249
3251 void ChromeContentBrowserClient::RegisterOutOfProcessServices( 3250 void ChromeContentBrowserClient::RegisterOutOfProcessServices(
3252 OutOfProcessServiceMap* services) { 3251 OutOfProcessServiceMap* services) {
3253 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) 3252 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
3254 services->insert(std::make_pair("media", 3253 services->insert(std::make_pair("media",
3255 base::ASCIIToUTF16("Media Service"))); 3254 base::ASCIIToUTF16("Media Service")));
3256 #endif 3255 #endif
3257 services->insert(std::make_pair(image_decoder::mojom::kServiceName,
3258 base::ASCIIToUTF16("Image Decoder Service")));
3259 } 3256 }
3260 3257
3261 std::unique_ptr<base::Value> 3258 std::unique_ptr<base::Value>
3262 ChromeContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) { 3259 ChromeContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
3263 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 3260 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
3264 int id = -1; 3261 int id = -1;
3265 if (name == content::mojom::kBrowserServiceName) 3262 if (name == content::mojom::kBrowserServiceName)
3266 id = IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY; 3263 id = IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY;
3267 else if (name == content::mojom::kGpuServiceName) 3264 else if (name == content::mojom::kGpuServiceName)
3268 id = IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY; 3265 id = IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY;
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
3563 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3560 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3564 return variations::GetVariationParamValue( 3561 return variations::GetVariationParamValue(
3565 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3562 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3566 } 3563 }
3567 3564
3568 // static 3565 // static
3569 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3566 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3570 const storage::QuotaSettings* settings) { 3567 const storage::QuotaSettings* settings) {
3571 g_default_quota_settings = settings; 3568 g_default_quota_settings = settings;
3572 } 3569 }
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/chrome_content_browser_manifest_overlay.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698