[Presentation API] (MR side) 1-UA: notify receiver page when receiver connection becomes available

chrome/browser/extensions/api/tab_capture/offscreen_tab.cc

 // Copyright 2015 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/extensions/api/tab_capture/offscreen_tab.h"
 
 #include <algorithm>
+#include <memory>
+#include <utility>

[mark a. foltz, 2016/10/04 00:32:20]

These #includes don't seem to be used in your patch - is this to fix missing
#includes?

It looks like this should #include <vector> as well.

 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
+#include "chrome/browser/media/router/receiver_presentation_service_delegate_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/web_contents_sizer.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/process_manager.h"
 
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::OffscreenTabsOwner);
@@ skipping 68 matching lines @@
 OffscreenTab::~OffscreenTab() {
   DVLOG(1) << "Destroying OffscreenTab for start_url=" << start_url_.spec();
 }
 
 void OffscreenTab::Start(const GURL& start_url,
                          const gfx::Size& initial_size,
                          const std::string& optional_presentation_id) {
   DCHECK(start_time_.is_null());
   start_url_ = start_url;
   DVLOG(1) << "Starting OffscreenTab with initial size of "
-           << initial_size.ToString() << " for start_url=" << start_url_.spec();
-
+           << initial_size.ToString() << " for start_url=" << start_url_.spec()
+           << " Register with PresentationRouter, id="

[mark a. foltz, 2016/10/04 00:32:20]

Did you mean ReceiverPresentationServiceDelegateImpl instead of
PresentationRouter?

[zhaobin, 2016/10/04 02:43:00]

Done.

+           << optional_presentation_id;
   // Create the WebContents to contain the off-screen tab's page.
   offscreen_tab_web_contents_.reset(
       WebContents::Create(WebContents::CreateParams(profile_.get())));
   offscreen_tab_web_contents_->SetDelegate(this);
   WebContentsObserver::Observe(offscreen_tab_web_contents_.get());
 
   // Set initial size, if specified.
   if (!initial_size.IsEmpty())
     ResizeWebContents(offscreen_tab_web_contents_.get(),
                       gfx::Rect(initial_size));
 
   // Mute audio output.  When tab capture starts, the audio will be
   // automatically unmuted, but will be captured into the MediaStream.
   offscreen_tab_web_contents_->SetAudioMuted(true);
 
   // TODO(imcheng): If |optional_presentation_id| is not empty, register it with
   // the PresentationRouter.  http://crbug.com/513859

[mark a. foltz, 2016/10/04 00:32:20]

s/PresentationRouter/ReceiverPresentationServiceDelegateImpl/

[zhaobin, 2016/10/04 02:43:00]

Done.

   if (!optional_presentation_id.empty()) {
-    NOTIMPLEMENTED()
-        << "Register with PresentationRouter, id=" << optional_presentation_id;
+#if defined(ENABLE_MEDIA_ROUTER)

[imcheng, 2016/09/28 07:28:35]

nit: Remove the #if

[zhaobin, 2016/09/29 17:20:42]

Done.

[mark a. foltz, 2016/10/04 00:32:20]

Still not done (did you upload the most recent patchset?)

+    // Register the offscreen tab as the receiver of the offscreen presentation.
+    media_router::ReceiverPresentationServiceDelegateImpl::CreateForWebContents(
+        offscreen_tab_web_contents_.get(), optional_presentation_id);
+#endif  // defined(ENABLE_MEDIA_ROUTER)
   }
 
   // Navigate to the initial URL.
   content::NavigationController::LoadURLParams load_params(start_url_);
   load_params.should_replace_current_entry = true;
   load_params.should_clear_history_list = true;
   offscreen_tab_web_contents_->GetController().LoadURLWithParams(load_params);
 
   start_time_ = base::TimeTicks::Now();
   DieIfContentCaptureEnded();
@@ skipping 229 matching lines @@
 
   // Schedule the timer to check again in a second.
   capture_poll_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromSeconds(kPollIntervalInSeconds),
       base::Bind(&OffscreenTab::DieIfContentCaptureEnded,
                  base::Unretained(this)));
 }
 
 }  // namespace extensions