| 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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 | 260 |
| 261 #if defined(USE_BROWSER_SPELLCHECKER) | 261 #if defined(USE_BROWSER_SPELLCHECKER) |
| 262 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" | 262 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" |
| 263 #endif | 263 #endif |
| 264 | 264 |
| 265 #if defined(ENABLE_WEBRTC) | 265 #if defined(ENABLE_WEBRTC) |
| 266 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 266 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
| 267 #endif | 267 #endif |
| 268 | 268 |
| 269 #if defined(ENABLE_MEDIA_ROUTER) | 269 #if defined(ENABLE_MEDIA_ROUTER) |
| 270 #include "chrome/browser/media/router/media_router_feature.h" |
| 270 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 271 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
| 271 #endif | 272 #endif |
| 272 | 273 |
| 273 using base::FileDescriptor; | 274 using base::FileDescriptor; |
| 274 using blink::WebWindowFeatures; | 275 using blink::WebWindowFeatures; |
| 275 using content::AccessTokenStore; | 276 using content::AccessTokenStore; |
| 276 using content::BrowserThread; | 277 using content::BrowserThread; |
| 277 using content::BrowserURLHandler; | 278 using content::BrowserURLHandler; |
| 278 using content::ChildProcessSecurityPolicy; | 279 using content::ChildProcessSecurityPolicy; |
| 279 using content::QuotaPermissionContext; | 280 using content::QuotaPermissionContext; |
| (...skipping 2322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2602 browser_context, params, callback); | 2603 browser_context, params, callback); |
| 2603 #else | 2604 #else |
| 2604 NOTIMPLEMENTED(); | 2605 NOTIMPLEMENTED(); |
| 2605 #endif | 2606 #endif |
| 2606 } | 2607 } |
| 2607 | 2608 |
| 2608 content::PresentationServiceDelegate* | 2609 content::PresentationServiceDelegate* |
| 2609 ChromeContentBrowserClient::GetPresentationServiceDelegate( | 2610 ChromeContentBrowserClient::GetPresentationServiceDelegate( |
| 2610 content::WebContents* web_contents) { | 2611 content::WebContents* web_contents) { |
| 2611 #if defined(ENABLE_MEDIA_ROUTER) | 2612 #if defined(ENABLE_MEDIA_ROUTER) |
| 2612 if (switches::MediaRouterEnabled() && | 2613 if (media_router::MediaRouterEnabled() && |
| 2613 !web_contents->GetBrowserContext()->IsOffTheRecord()) { | 2614 !web_contents->GetBrowserContext()->IsOffTheRecord()) { |
| 2614 return media_router::PresentationServiceDelegateImpl:: | 2615 return media_router::PresentationServiceDelegateImpl:: |
| 2615 GetOrCreateForWebContents(web_contents); | 2616 GetOrCreateForWebContents(web_contents); |
| 2616 } | 2617 } |
| 2617 #endif | 2618 #endif |
| 2618 return nullptr; | 2619 return nullptr; |
| 2619 } | 2620 } |
| 2620 | 2621 |
| 2621 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric, | 2622 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric, |
| 2622 const GURL& url) { | 2623 const GURL& url) { |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2725 if (channel <= kMaxDisableEncryptionChannel) { | 2726 if (channel <= kMaxDisableEncryptionChannel) { |
| 2726 static const char* const kWebRtcDevSwitchNames[] = { | 2727 static const char* const kWebRtcDevSwitchNames[] = { |
| 2727 switches::kDisableWebRtcEncryption, | 2728 switches::kDisableWebRtcEncryption, |
| 2728 }; | 2729 }; |
| 2729 to_command_line->CopySwitchesFrom(from_command_line, | 2730 to_command_line->CopySwitchesFrom(from_command_line, |
| 2730 kWebRtcDevSwitchNames, | 2731 kWebRtcDevSwitchNames, |
| 2731 arraysize(kWebRtcDevSwitchNames)); | 2732 arraysize(kWebRtcDevSwitchNames)); |
| 2732 } | 2733 } |
| 2733 } | 2734 } |
| 2734 #endif // defined(ENABLE_WEBRTC) | 2735 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |