[Presentation API] 1-UA presentation support + presenter APIs.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 247 matching lines @@
 #if defined(USE_BROWSER_SPELLCHECKER)
 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h"
 #endif
 
 #if defined(ENABLE_WEBRTC)
 #include "chrome/browser/media/webrtc_logging_handler_host.h"
 #endif
 
 #if defined(ENABLE_MEDIA_ROUTER)
 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
+#include "chrome/browser/media/router/receiver_presentation_service_delegate_impl.h"
 #endif
 
 using base::FileDescriptor;
 using blink::WebWindowFeatures;
 using content::AccessTokenStore;
 using content::BrowserThread;
 using content::BrowserURLHandler;
 using content::ChildProcessSecurityPolicy;
 using content::QuotaPermissionContext;
 using content::RenderFrameHost;
@@ skipping 2309 matching lines @@
       browser_context, params, callback);
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 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()) {
+    // ReceiverPresentationServiceDelegateImpl are for WebContents created for
+    // offscreen presentations. The WebContents is from an incognito profile.
+    if (auto* impl = media_router::ReceiverPresentationServiceDelegateImpl::
+            FromWebContents(web_contents)) {
+      DCHECK(web_contents->GetBrowserContext()->IsOffTheRecord());
+      return impl;
+    }
+    // TODO(imcheng): Presentation API is disabled in incognito mode for the
+    // time being. crbug.com/524795
+    if (web_contents->GetBrowserContext()->IsOffTheRecord()) {
+      return nullptr;
+    } else {

[whywhat, 2015/10/13 15:21:30]

nit: I believe

if (a)
  return b;
else
  return c;

is usually written as

if (a)
  return b;

return c;

[imcheng, 2015/10/17 01:00:22]

Done.

+      return media_router::PresentationServiceDelegateImpl::
+          GetOrCreateForWebContents(web_contents);
+    }
   }
 #endif
   return nullptr;
 }
 
 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric,
                                                  const GURL& url) {
   if (url.is_valid()) {
     rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(),
                                             metric, url);
@@ skipping 99 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)