Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2342)

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1314413005: [Presentation API] 1-UA presentation support + presenter APIs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0f9113561b6b3e947b78bc6421dd00819f02bfbe..ff5449505945a811bf018788f85e9afbed9c5111 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -256,6 +256,7 @@
#endif
#if defined(ENABLE_MEDIA_ROUTER)
+#include "chrome/browser/media/router/incognito_presentation_service_delegate.h"
#include "chrome/browser/media/router/presentation_service_delegate_impl.h"
#endif
@@ -2554,10 +2555,14 @@ content::PresentationServiceDelegate*
ChromeContentBrowserClient::GetPresentationServiceDelegate(
content::WebContents* web_contents) {
#if defined(ENABLE_MEDIA_ROUTER)
- if (switches::MediaRouterEnabled() &&
- !web_contents->GetBrowserContext()->IsOffTheRecord()) {
- return media_router::PresentationServiceDelegateImpl::
- GetOrCreateForWebContents(web_contents);
+ if (switches::MediaRouterEnabled()) {
+ if (web_contents->GetBrowserContext()->IsOffTheRecord()) {
+ 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
+ GetOrCreateForWebContents(web_contents);
+ } else {
+ return media_router::PresentationServiceDelegateImpl::
+ GetOrCreateForWebContents(web_contents);
+ }
}
#endif
return nullptr;

Powered by Google App Engine
This is Rietveld 408576698