Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index c989f7c258e2e9b193f13844db8233ef6ac14bfc..f0e000ab6614340c5be43e01f82f022f60b702cd 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -336,6 +336,7 @@ |
#if defined(ENABLE_MEDIA_ROUTER) |
#include "chrome/browser/media/router/media_router_feature.h" |
#include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
+#include "chrome/browser/media/router/receiver_presentation_service_delegate_impl.h" |
#endif // defined(ENABLE_MEDIA_ROUTER) |
#if BUILDFLAG(ENABLE_MEDIA_REMOTING) && defined(ENABLE_MEDIA_ROUTER) |
@@ -3102,9 +3103,9 @@ void ChromeContentBrowserClient::OpenURL( |
#endif |
} |
-content::PresentationServiceDelegate* |
-ChromeContentBrowserClient::GetPresentationServiceDelegate( |
- content::WebContents* web_contents) { |
+content::ControllerPresentationServiceDelegate* |
+ChromeContentBrowserClient::GetControllerPresentationServiceDelegate( |
+ content::WebContents* web_contents) { |
#if defined(ENABLE_MEDIA_ROUTER) |
if (media_router::MediaRouterEnabled(web_contents->GetBrowserContext())) { |
return media_router::PresentationServiceDelegateImpl:: |
@@ -3114,6 +3115,24 @@ ChromeContentBrowserClient::GetPresentationServiceDelegate( |
return nullptr; |
} |
+content::ReceiverPresentationServiceDelegate* |
+ChromeContentBrowserClient::GetReceiverPresentationServiceDelegate( |
+ content::WebContents* web_contents) { |
+#if defined(ENABLE_MEDIA_ROUTER) |
+ if (media_router::MediaRouterEnabled(web_contents->GetBrowserContext())) { |
+ // ReceiverPresentationServiceDelegateImpl exists only for WebContents |
+ // created for offscreen presentations. The WebContents must belong to |
+ // an incognito profile. |
+ if (auto* impl = media_router::ReceiverPresentationServiceDelegateImpl:: |
+ FromWebContents(web_contents)) { |
+ if (web_contents->GetBrowserContext()->IsOffTheRecord()) |
mark a. foltz
2016/12/02 22:09:05
Combine if() clauses into one statement.
zhaobin
2016/12/03 00:34:26
Done.
|
+ return impl; |
+ } |
+ } |
+#endif // defined(ENABLE_MEDIA_ROUTER) |
+ return nullptr; |
+} |
+ |
void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric, |
const GURL& url) { |
if (url.is_valid()) { |