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

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

Issue 1968833002: media: Make media mojo services a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 4 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 | « chrome/browser/BUILD.gn ('k') | chromecast/browser/media/BUILD.gn » ('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 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 303
304 #if defined(ENABLE_WAYLAND_SERVER) 304 #if defined(ENABLE_WAYLAND_SERVER)
305 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" 305 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
306 #endif 306 #endif
307 307
308 #if defined(ENABLE_MOJO_MEDIA) 308 #if defined(ENABLE_MOJO_MEDIA)
309 #include "chrome/browser/media/output_protection_impl.h" 309 #include "chrome/browser/media/output_protection_impl.h"
310 #endif 310 #endif
311 311
312 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 312 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
313 #include "media/mojo/services/mojo_media_application_factory.h" 313 #include "media/mojo/services/mojo_media_application_factory.h" // nogncheck
314 #endif 314 #endif
315 315
316 using base::FileDescriptor; 316 using base::FileDescriptor;
317 using blink::WebWindowFeatures; 317 using blink::WebWindowFeatures;
318 using content::AccessTokenStore; 318 using content::AccessTokenStore;
319 using content::BrowserThread; 319 using content::BrowserThread;
320 using content::BrowserURLHandler; 320 using content::BrowserURLHandler;
321 using content::ChildProcessSecurityPolicy; 321 using content::ChildProcessSecurityPolicy;
322 using content::QuotaPermissionContext; 322 using content::QuotaPermissionContext;
323 using content::RenderFrameHost; 323 using content::RenderFrameHost;
(...skipping 2652 matching lines...) Expand 10 before | Expand all | Expand 10 after
2976 if (channel <= kMaxDisableEncryptionChannel) { 2976 if (channel <= kMaxDisableEncryptionChannel) {
2977 static const char* const kWebRtcDevSwitchNames[] = { 2977 static const char* const kWebRtcDevSwitchNames[] = {
2978 switches::kDisableWebRtcEncryption, 2978 switches::kDisableWebRtcEncryption,
2979 }; 2979 };
2980 to_command_line->CopySwitchesFrom(from_command_line, 2980 to_command_line->CopySwitchesFrom(from_command_line,
2981 kWebRtcDevSwitchNames, 2981 kWebRtcDevSwitchNames,
2982 arraysize(kWebRtcDevSwitchNames)); 2982 arraysize(kWebRtcDevSwitchNames));
2983 } 2983 }
2984 } 2984 }
2985 #endif // defined(ENABLE_WEBRTC) 2985 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chromecast/browser/media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698