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

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

Issue 2900773004: media: Add experimental feature to enable Mojo CDM on desktop Chromium (Closed)
Patch Set: drop utility_process_host_impl.cc change Created 3 years, 7 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 | « no previous file | content/browser/media/encrypted_media_browsertest.cc » ('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 3235 matching lines...) Expand 10 before | Expand all | Expand 10 after
3246 info.factory = base::Bind(&ash_util::CreateEmbeddedAshService, 3246 info.factory = base::Bind(&ash_util::CreateEmbeddedAshService,
3247 base::ThreadTaskRunnerHandle::Get()); 3247 base::ThreadTaskRunnerHandle::Get());
3248 info.task_runner = base::ThreadTaskRunnerHandle::Get(); 3248 info.task_runner = base::ThreadTaskRunnerHandle::Get();
3249 services->insert(std::make_pair(ash::mojom::kServiceName, info)); 3249 services->insert(std::make_pair(ash::mojom::kServiceName, info));
3250 } 3250 }
3251 #endif // OS_CHROMEOS 3251 #endif // OS_CHROMEOS
3252 } 3252 }
3253 3253
3254 void ChromeContentBrowserClient::RegisterOutOfProcessServices( 3254 void ChromeContentBrowserClient::RegisterOutOfProcessServices(
3255 OutOfProcessServiceMap* services) { 3255 OutOfProcessServiceMap* services) {
3256 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
3257 services->emplace("media", base::ASCIIToUTF16("Media Service"));
3258 #endif
3259
3260 #if BUILDFLAG(ENABLE_PRINTING) 3256 #if BUILDFLAG(ENABLE_PRINTING)
3261 services->emplace(printing::mojom::kServiceName, 3257 services->emplace(printing::mojom::kServiceName,
3262 base::ASCIIToUTF16("PDF Compositor Service")); 3258 base::ASCIIToUTF16("PDF Compositor Service"));
3263 #endif 3259 #endif
3264 } 3260 }
3265 3261
3266 std::unique_ptr<base::Value> 3262 std::unique_ptr<base::Value>
3267 ChromeContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) { 3263 ChromeContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
3268 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 3264 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
3269 int id = -1; 3265 int id = -1;
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
3582 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3578 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3583 return variations::GetVariationParamValue( 3579 return variations::GetVariationParamValue(
3584 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3580 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3585 } 3581 }
3586 3582
3587 // static 3583 // static
3588 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3584 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3589 const storage::QuotaSettings* settings) { 3585 const storage::QuotaSettings* settings) {
3590 g_default_quota_settings = settings; 3586 g_default_quota_settings = settings;
3591 } 3587 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/media/encrypted_media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698