| 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 2331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2613 browser_context, params, callback); | 2614 browser_context, params, callback); |
| 2614 #else | 2615 #else |
| 2615 NOTIMPLEMENTED(); | 2616 NOTIMPLEMENTED(); |
| 2616 #endif | 2617 #endif |
| 2617 } | 2618 } |
| 2618 | 2619 |
| 2619 content::PresentationServiceDelegate* | 2620 content::PresentationServiceDelegate* |
| 2620 ChromeContentBrowserClient::GetPresentationServiceDelegate( | 2621 ChromeContentBrowserClient::GetPresentationServiceDelegate( |
| 2621 content::WebContents* web_contents) { | 2622 content::WebContents* web_contents) { |
| 2622 #if defined(ENABLE_MEDIA_ROUTER) | 2623 #if defined(ENABLE_MEDIA_ROUTER) |
| 2623 if (switches::MediaRouterEnabled() && | 2624 if (media_router::MediaRouterEnabled() && |
| 2624 !web_contents->GetBrowserContext()->IsOffTheRecord()) { | 2625 !web_contents->GetBrowserContext()->IsOffTheRecord()) { |
| 2625 return media_router::PresentationServiceDelegateImpl:: | 2626 return media_router::PresentationServiceDelegateImpl:: |
| 2626 GetOrCreateForWebContents(web_contents); | 2627 GetOrCreateForWebContents(web_contents); |
| 2627 } | 2628 } |
| 2628 #endif | 2629 #endif |
| 2629 return nullptr; | 2630 return nullptr; |
| 2630 } | 2631 } |
| 2631 | 2632 |
| 2632 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric, | 2633 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric, |
| 2633 const GURL& url) { | 2634 const GURL& url) { |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2751 if (channel <= kMaxDisableEncryptionChannel) { | 2752 if (channel <= kMaxDisableEncryptionChannel) { |
| 2752 static const char* const kWebRtcDevSwitchNames[] = { | 2753 static const char* const kWebRtcDevSwitchNames[] = { |
| 2753 switches::kDisableWebRtcEncryption, | 2754 switches::kDisableWebRtcEncryption, |
| 2754 }; | 2755 }; |
| 2755 to_command_line->CopySwitchesFrom(from_command_line, | 2756 to_command_line->CopySwitchesFrom(from_command_line, |
| 2756 kWebRtcDevSwitchNames, | 2757 kWebRtcDevSwitchNames, |
| 2757 arraysize(kWebRtcDevSwitchNames)); | 2758 arraysize(kWebRtcDevSwitchNames)); |
| 2758 } | 2759 } |
| 2759 } | 2760 } |
| 2760 #endif // defined(ENABLE_WEBRTC) | 2761 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |