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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
249 | 249 |
250 #if defined(USE_BROWSER_SPELLCHECKER) | 250 #if defined(USE_BROWSER_SPELLCHECKER) |
251 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" | 251 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h" |
252 #endif | 252 #endif |
253 | 253 |
254 #if defined(ENABLE_WEBRTC) | 254 #if defined(ENABLE_WEBRTC) |
255 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 255 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
256 #endif | 256 #endif |
257 | 257 |
258 #if defined(ENABLE_MEDIA_ROUTER) | 258 #if defined(ENABLE_MEDIA_ROUTER) |
259 #include "chrome/browser/media/router/incognito_presentation_service_delegate.h" | |
259 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 260 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
260 #endif | 261 #endif |
261 | 262 |
262 using base::FileDescriptor; | 263 using base::FileDescriptor; |
263 using blink::WebWindowFeatures; | 264 using blink::WebWindowFeatures; |
264 using content::AccessTokenStore; | 265 using content::AccessTokenStore; |
265 using content::BrowserThread; | 266 using content::BrowserThread; |
266 using content::BrowserURLHandler; | 267 using content::BrowserURLHandler; |
267 using content::ChildProcessSecurityPolicy; | 268 using content::ChildProcessSecurityPolicy; |
268 using content::QuotaPermissionContext; | 269 using content::QuotaPermissionContext; |
(...skipping 2278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2547 browser_context, params, callback); | 2548 browser_context, params, callback); |
2548 #else | 2549 #else |
2549 NOTIMPLEMENTED(); | 2550 NOTIMPLEMENTED(); |
2550 #endif | 2551 #endif |
2551 } | 2552 } |
2552 | 2553 |
2553 content::PresentationServiceDelegate* | 2554 content::PresentationServiceDelegate* |
2554 ChromeContentBrowserClient::GetPresentationServiceDelegate( | 2555 ChromeContentBrowserClient::GetPresentationServiceDelegate( |
2555 content::WebContents* web_contents) { | 2556 content::WebContents* web_contents) { |
2556 #if defined(ENABLE_MEDIA_ROUTER) | 2557 #if defined(ENABLE_MEDIA_ROUTER) |
2557 if (switches::MediaRouterEnabled() && | 2558 if (switches::MediaRouterEnabled()) { |
2558 !web_contents->GetBrowserContext()->IsOffTheRecord()) { | 2559 if (web_contents->GetBrowserContext()->IsOffTheRecord()) { |
2559 return media_router::PresentationServiceDelegateImpl:: | 2560 return media_router::IncognitoPresentationServiceDelegate:: |
whywhat
2015/09/14 15:20:39
nit: is this an Impl of the PresentationServiceDel
imcheng
2015/09/26 01:21:56
Renamed to ReceiverPresentationServiceDelegateImpl
| |
2560 GetOrCreateForWebContents(web_contents); | 2561 GetOrCreateForWebContents(web_contents); |
2562 } else { | |
2563 return media_router::PresentationServiceDelegateImpl:: | |
2564 GetOrCreateForWebContents(web_contents); | |
2565 } | |
2561 } | 2566 } |
2562 #endif | 2567 #endif |
2563 return nullptr; | 2568 return nullptr; |
2564 } | 2569 } |
2565 | 2570 |
2566 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric, | 2571 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric, |
2567 const GURL& url) { | 2572 const GURL& url) { |
2568 if (url.is_valid()) { | 2573 if (url.is_valid()) { |
2569 rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(), | 2574 rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(), |
2570 metric, url); | 2575 metric, url); |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2644 switches::kDisableWebRtcEncryption, | 2649 switches::kDisableWebRtcEncryption, |
2645 }; | 2650 }; |
2646 to_command_line->CopySwitchesFrom(from_command_line, | 2651 to_command_line->CopySwitchesFrom(from_command_line, |
2647 kWebRtcDevSwitchNames, | 2652 kWebRtcDevSwitchNames, |
2648 arraysize(kWebRtcDevSwitchNames)); | 2653 arraysize(kWebRtcDevSwitchNames)); |
2649 } | 2654 } |
2650 } | 2655 } |
2651 #endif // defined(ENABLE_WEBRTC) | 2656 #endif // defined(ENABLE_WEBRTC) |
2652 | 2657 |
2653 } // namespace chrome | 2658 } // namespace chrome |
OLD | NEW |