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

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

Issue 2616703005: media: Fix ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS check (Closed)
Patch Set: Created 3 years, 11 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/shell/browser/shell_content_browser_client.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 3043 matching lines...) Expand 10 before | Expand all | Expand 10 after
3054 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess( 3054 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess(
3055 service_manager::InterfaceRegistry* registry, 3055 service_manager::InterfaceRegistry* registry,
3056 content::GpuProcessHost* render_process_host) { 3056 content::GpuProcessHost* render_process_host) {
3057 registry->AddInterface( 3057 registry->AddInterface(
3058 base::Bind(&metrics::CallStackProfileCollector::Create, 3058 base::Bind(&metrics::CallStackProfileCollector::Create,
3059 metrics::CallStackProfileParams::GPU_PROCESS)); 3059 metrics::CallStackProfileParams::GPU_PROCESS));
3060 } 3060 }
3061 3061
3062 void ChromeContentBrowserClient::RegisterInProcessServices( 3062 void ChromeContentBrowserClient::RegisterInProcessServices(
3063 StaticServiceMap* services) { 3063 StaticServiceMap* services) {
3064 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 3064 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
3065 content::ServiceInfo info; 3065 content::ServiceInfo info;
3066 info.factory = base::Bind(&media::CreateMediaService); 3066 info.factory = base::Bind(&media::CreateMediaService);
3067 services->insert(std::make_pair("media", info)); 3067 services->insert(std::make_pair("media", info));
3068 #endif 3068 #endif
3069 #if defined(OS_CHROMEOS) 3069 #if defined(OS_CHROMEOS)
3070 content::ServiceManagerConnection::GetForProcess()->AddConnectionFilter( 3070 content::ServiceManagerConnection::GetForProcess()->AddConnectionFilter(
3071 base::MakeUnique<chromeos::ChromeInterfaceFactory>()); 3071 base::MakeUnique<chromeos::ChromeInterfaceFactory>());
3072 { 3072 {
3073 content::ServiceInfo info; 3073 content::ServiceInfo info;
3074 info.factory = base::Bind([] { 3074 info.factory = base::Bind([] {
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
3371 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() { 3371 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() {
3372 return variations::GetVariationParamValue( 3372 return variations::GetVariationParamValue(
3373 "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true"; 3373 "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true";
3374 } 3374 }
3375 3375
3376 bool ChromeContentBrowserClient:: 3376 bool ChromeContentBrowserClient::
3377 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3377 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3378 return variations::GetVariationParamValue( 3378 return variations::GetVariationParamValue(
3379 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3379 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3380 } 3380 }
OLDNEW
« no previous file with comments | « no previous file | content/shell/browser/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698