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 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 | 262 |
263 #if defined(USE_BROWSER_SPELLCHECKER) | 263 #if defined(USE_BROWSER_SPELLCHECKER) |
264 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" | 264 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" |
265 #endif | 265 #endif |
266 | 266 |
267 #if defined(ENABLE_WEBRTC) | 267 #if defined(ENABLE_WEBRTC) |
268 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 268 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
269 #endif | 269 #endif |
270 | 270 |
271 #if defined(ENABLE_MEDIA_ROUTER) | 271 #if defined(ENABLE_MEDIA_ROUTER) |
| 272 #include "chrome/browser/media/router/media_router_feature.h" |
272 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 273 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
273 #endif | 274 #endif |
274 | 275 |
275 using base::FileDescriptor; | 276 using base::FileDescriptor; |
276 using blink::WebWindowFeatures; | 277 using blink::WebWindowFeatures; |
277 using content::AccessTokenStore; | 278 using content::AccessTokenStore; |
278 using content::BrowserThread; | 279 using content::BrowserThread; |
279 using content::BrowserURLHandler; | 280 using content::BrowserURLHandler; |
280 using content::ChildProcessSecurityPolicy; | 281 using content::ChildProcessSecurityPolicy; |
281 using content::QuotaPermissionContext; | 282 using content::QuotaPermissionContext; |
(...skipping 2327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2609 browser_context, params, callback); | 2610 browser_context, params, callback); |
2610 #else | 2611 #else |
2611 NOTIMPLEMENTED(); | 2612 NOTIMPLEMENTED(); |
2612 #endif | 2613 #endif |
2613 } | 2614 } |
2614 | 2615 |
2615 content::PresentationServiceDelegate* | 2616 content::PresentationServiceDelegate* |
2616 ChromeContentBrowserClient::GetPresentationServiceDelegate( | 2617 ChromeContentBrowserClient::GetPresentationServiceDelegate( |
2617 content::WebContents* web_contents) { | 2618 content::WebContents* web_contents) { |
2618 #if defined(ENABLE_MEDIA_ROUTER) | 2619 #if defined(ENABLE_MEDIA_ROUTER) |
2619 if (switches::MediaRouterEnabled() && | 2620 if (media_router::MediaRouterEnabled() && |
2620 !web_contents->GetBrowserContext()->IsOffTheRecord()) { | 2621 !web_contents->GetBrowserContext()->IsOffTheRecord()) { |
2621 return media_router::PresentationServiceDelegateImpl:: | 2622 return media_router::PresentationServiceDelegateImpl:: |
2622 GetOrCreateForWebContents(web_contents); | 2623 GetOrCreateForWebContents(web_contents); |
2623 } | 2624 } |
2624 #endif | 2625 #endif |
2625 return nullptr; | 2626 return nullptr; |
2626 } | 2627 } |
2627 | 2628 |
2628 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric, | 2629 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric, |
2629 const GURL& url) { | 2630 const GURL& url) { |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2747 if (channel <= kMaxDisableEncryptionChannel) { | 2748 if (channel <= kMaxDisableEncryptionChannel) { |
2748 static const char* const kWebRtcDevSwitchNames[] = { | 2749 static const char* const kWebRtcDevSwitchNames[] = { |
2749 switches::kDisableWebRtcEncryption, | 2750 switches::kDisableWebRtcEncryption, |
2750 }; | 2751 }; |
2751 to_command_line->CopySwitchesFrom(from_command_line, | 2752 to_command_line->CopySwitchesFrom(from_command_line, |
2752 kWebRtcDevSwitchNames, | 2753 kWebRtcDevSwitchNames, |
2753 arraysize(kWebRtcDevSwitchNames)); | 2754 arraysize(kWebRtcDevSwitchNames)); |
2754 } | 2755 } |
2755 } | 2756 } |
2756 #endif // defined(ENABLE_WEBRTC) | 2757 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |