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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 #if defined(USE_BROWSER_SPELLCHECKER) | 256 #if defined(USE_BROWSER_SPELLCHECKER) |
257 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" | 257 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" |
258 #endif | 258 #endif |
259 | 259 |
260 #if defined(ENABLE_WEBRTC) | 260 #if defined(ENABLE_WEBRTC) |
261 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 261 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
262 #endif | 262 #endif |
263 | 263 |
264 #if defined(ENABLE_MEDIA_ROUTER) | 264 #if defined(ENABLE_MEDIA_ROUTER) |
265 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 265 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
| 266 #include "chrome/browser/media/router/receiver_presentation_service_delegate_imp
l.h" |
266 #endif | 267 #endif |
267 | 268 |
268 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 269 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
269 #include "chrome/browser/usb/web_usb_permission_provider.h" | 270 #include "chrome/browser/usb/web_usb_permission_provider.h" |
270 #endif | 271 #endif |
271 | 272 |
272 using base::FileDescriptor; | 273 using base::FileDescriptor; |
273 using blink::WebWindowFeatures; | 274 using blink::WebWindowFeatures; |
274 using content::AccessTokenStore; | 275 using content::AccessTokenStore; |
275 using content::BrowserThread; | 276 using content::BrowserThread; |
(...skipping 2308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2584 browser_context, params, callback); | 2585 browser_context, params, callback); |
2585 #else | 2586 #else |
2586 NOTIMPLEMENTED(); | 2587 NOTIMPLEMENTED(); |
2587 #endif | 2588 #endif |
2588 } | 2589 } |
2589 | 2590 |
2590 content::PresentationServiceDelegate* | 2591 content::PresentationServiceDelegate* |
2591 ChromeContentBrowserClient::GetPresentationServiceDelegate( | 2592 ChromeContentBrowserClient::GetPresentationServiceDelegate( |
2592 content::WebContents* web_contents) { | 2593 content::WebContents* web_contents) { |
2593 #if defined(ENABLE_MEDIA_ROUTER) | 2594 #if defined(ENABLE_MEDIA_ROUTER) |
2594 if (switches::MediaRouterEnabled() && | 2595 if (switches::MediaRouterEnabled()) { |
2595 !web_contents->GetBrowserContext()->IsOffTheRecord()) { | 2596 if (web_contents->GetBrowserContext()->IsOffTheRecord()) { |
2596 return media_router::PresentationServiceDelegateImpl:: | 2597 return media_router::ReceiverPresentationServiceDelegateImpl:: |
2597 GetOrCreateForWebContents(web_contents); | 2598 FromWebContents(web_contents); |
| 2599 } else { |
| 2600 return media_router::PresentationServiceDelegateImpl:: |
| 2601 GetOrCreateForWebContents(web_contents); |
| 2602 } |
2598 } | 2603 } |
2599 #endif | 2604 #endif |
2600 return nullptr; | 2605 return nullptr; |
2601 } | 2606 } |
2602 | 2607 |
2603 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric, | 2608 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric, |
2604 const GURL& url) { | 2609 const GURL& url) { |
2605 if (url.is_valid()) { | 2610 if (url.is_valid()) { |
2606 rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(), | 2611 rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(), |
2607 metric, url); | 2612 metric, url); |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2707 if (channel <= kMaxDisableEncryptionChannel) { | 2712 if (channel <= kMaxDisableEncryptionChannel) { |
2708 static const char* const kWebRtcDevSwitchNames[] = { | 2713 static const char* const kWebRtcDevSwitchNames[] = { |
2709 switches::kDisableWebRtcEncryption, | 2714 switches::kDisableWebRtcEncryption, |
2710 }; | 2715 }; |
2711 to_command_line->CopySwitchesFrom(from_command_line, | 2716 to_command_line->CopySwitchesFrom(from_command_line, |
2712 kWebRtcDevSwitchNames, | 2717 kWebRtcDevSwitchNames, |
2713 arraysize(kWebRtcDevSwitchNames)); | 2718 arraysize(kWebRtcDevSwitchNames)); |
2714 } | 2719 } |
2715 } | 2720 } |
2716 #endif // defined(ENABLE_WEBRTC) | 2721 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |