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

Side by Side Diff: content/shell/browser/shell_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 | « chrome/browser/chrome_content_browser_client.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/shell/browser/shell_content_browser_client.h" 5 #include "content/shell/browser/shell_content_browser_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 }; 189 };
190 for (size_t i = 0; i < arraysize(kProtocolList); ++i) { 190 for (size_t i = 0; i < arraysize(kProtocolList); ++i) {
191 if (url.scheme() == kProtocolList[i]) 191 if (url.scheme() == kProtocolList[i])
192 return true; 192 return true;
193 } 193 }
194 return false; 194 return false;
195 } 195 }
196 196
197 void ShellContentBrowserClient::RegisterInProcessServices( 197 void ShellContentBrowserClient::RegisterInProcessServices(
198 StaticServiceMap* services) { 198 StaticServiceMap* services) {
199 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 199 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
200 { 200 {
201 content::ServiceInfo info; 201 content::ServiceInfo info;
202 info.factory = base::Bind(&media::CreateMediaServiceForTesting); 202 info.factory = base::Bind(&media::CreateMediaServiceForTesting);
203 services->insert(std::make_pair("media", info)); 203 services->insert(std::make_pair("media", info));
204 } 204 }
205 #endif 205 #endif
206 #if defined(USE_AURA) 206 #if defined(USE_AURA)
207 { 207 {
208 content::ServiceInfo info; 208 content::ServiceInfo info;
209 info.factory = base::Bind(&navigation::CreateNavigationService); 209 info.factory = base::Bind(&navigation::CreateNavigationService);
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 ShellBrowserContext* ShellContentBrowserClient::browser_context() { 387 ShellBrowserContext* ShellContentBrowserClient::browser_context() {
388 return shell_browser_main_parts_->browser_context(); 388 return shell_browser_main_parts_->browser_context();
389 } 389 }
390 390
391 ShellBrowserContext* 391 ShellBrowserContext*
392 ShellContentBrowserClient::off_the_record_browser_context() { 392 ShellContentBrowserClient::off_the_record_browser_context() {
393 return shell_browser_main_parts_->off_the_record_browser_context(); 393 return shell_browser_main_parts_->off_the_record_browser_context();
394 } 394 }
395 395
396 } // namespace content 396 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698