[Presentation API] (3rd) (1-UA) Split PresentationServiceDelegateImpl(PSDImpl)

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 313 matching lines @@
 
 #if defined(ENABLE_WEBRTC)
 #include "chrome/browser/media/audio_debug_recordings_handler.h"
 #include "chrome/browser/media/webrtc/webrtc_logging_handler_host.h"
 #endif
 
 #if defined(ENABLE_MEDIA_ROUTER)
 #include "chrome/browser/media/cast_remoting_connector.h"
 #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
 
 #if defined(ENABLE_WAYLAND_SERVER)
 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
 #endif
 
 #if defined(ENABLE_MOJO_MEDIA)
 #include "chrome/browser/media/output_protection_impl.h"
 #endif
 
@@ skipping 2703 matching lines @@
       params.url,
       params.transition);
   FillNavigateParamsFromOpenURLParams(&nav_params, params);
   nav_params.user_gesture = params.user_gesture;
 
   Navigate(&nav_params);
   callback.Run(nav_params.target_contents);
 #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::
         GetOrCreateForWebContents(web_contents);
   }
 #endif  // defined(ENABLE_MEDIA_ROUTER)
   return nullptr;
 }
 
+content::ReceiverPresentationServiceDelegate*
+ChromeContentBrowserClient::GetReceiverPresentationServiceDelegate(
+    content::WebContents* web_contents) {
+  if (media_router::MediaRouterEnabled(web_contents->GetBrowserContext())) {

[mark a. foltz, 2016/11/08 23:40:51]

Please guard code that uses media_router:: with #if defined(ENABLE_MEDIA_ROUTER)
as above.

[zhaobin, 2016/11/10 04:13:59]

Done.

+    // 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)) {
+      DCHECK(web_contents->GetBrowserContext()->IsOffTheRecord());

[mark a. foltz, 2016/11/08 23:40:51]

API design opinion:

This API is part of content/browser and it's a little weird to have a method
that will DCHECK for some WebContents.  If the caller passes a WebContents* that
cannot be a receiver, I would just return nullptr instead of DCHECK(), and the
caller can check the return value if it expects it to be valid.

[zhaobin, 2016/11/10 04:13:59]

Done.

+      return impl;
+    }
+  }
+  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);
   }
 }
 
 ScopedVector<content::NavigationThrottle>
 ChromeContentBrowserClient::CreateThrottlesForNavigation(
@@ skipping 150 matching lines @@
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 std::unique_ptr<content::MemoryCoordinatorDelegate>
 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() {
   return memory::ChromeMemoryCoordinatorDelegate::Create();
 }