Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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 |
|
ddorwin
2016/05/11 23:02:27
Why is this now required? Is this a bug in DEPS ha
xhwang
2016/05/12 06:32:24
// nogncheck is recommended for this kind of condi
xhwang
2016/05/16 05:41:20
Per brettw's comment, I think this is the right th
| |
| 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 Loading... | |
| 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) |
| OLD | NEW |