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

Unified Diff: chrome/browser/media/router/presentation_service_delegate_impl.cc

Issue 2737413003: [Presentation API] Remove references to presentation sessions. (Closed)
Patch Set: Update PresentationServiceDelegateImpl unittest Created 3 years, 9 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/media/router/presentation_service_delegate_impl.cc
diff --git a/chrome/browser/media/router/presentation_service_delegate_impl.cc b/chrome/browser/media/router/presentation_service_delegate_impl.cc
index 5d6e630125f969a42035290dd7911bc1cf4d841a..784a226675a241e33a6f0ff1aa21051fbc0611d1 100644
--- a/chrome/browser/media/router/presentation_service_delegate_impl.cc
+++ b/chrome/browser/media/router/presentation_service_delegate_impl.cc
@@ -32,7 +32,7 @@
#include "content/public/browser/presentation_screen_availability_listener.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
-#include "content/public/common/presentation_session.h"
+#include "content/public/common/presentation_info.h"
#include "url/gurl.h"
#if !defined(OS_ANDROID)
@@ -71,13 +71,13 @@ url::Origin GetLastCommittedURLForFrame(
// Observes messages originating from the MediaSink connected to a MediaRoute
// that represents a presentation. Converts the messages into
-// content::PresentationSessionMessages and dispatches them via the provided
-// PresentationSessionMessageCallback.
-class PresentationSessionMessagesObserver : public RouteMessageObserver {
+// content::PresentationConnectionMessages and dispatches them via the provided
+// PresentationConnectionMessageCallback.
+class PresentationConnectionMessagesObserver : public RouteMessageObserver {
public:
// |message_cb|: The callback to invoke whenever messages are received.
// |route_id|: ID of MediaRoute to listen for messages.
- PresentationSessionMessagesObserver(
+ PresentationConnectionMessagesObserver(
MediaRouter* router,
const MediaRoute::Id& route_id,
const content::PresentationConnectionMessageCallback& message_cb)
@@ -85,7 +85,7 @@ class PresentationSessionMessagesObserver : public RouteMessageObserver {
DCHECK(!message_cb_.is_null());
}
- ~PresentationSessionMessagesObserver() final {}
+ ~PresentationConnectionMessagesObserver() final {}
void OnMessagesReceived(const std::vector<RouteMessage>& messages) final {
DVLOG(2) << __func__ << ", number of messages : " << messages.size();
@@ -107,7 +107,7 @@ class PresentationSessionMessagesObserver : public RouteMessageObserver {
private:
const content::PresentationConnectionMessageCallback message_cb_;
- DISALLOW_COPY_AND_ASSIGN(PresentationSessionMessagesObserver);
+ DISALLOW_COPY_AND_ASSIGN(PresentationConnectionMessagesObserver);
};
} // namespace
@@ -117,8 +117,8 @@ class PresentationSessionMessagesObserver : public RouteMessageObserver {
// Its lifetime:
// * Create an instance with |render_frame_host_id_| if no instance with the
// same |render_frame_host_id_| exists in:
-// PresentationFrameManager::OnPresentationSessionStarted
-// PresentationFrameManager::OnDefaultPresentationSessionStarted
+// PresentationFrameManager::OnPresentationConnection
+// PresentationFrameManager::OnDefaultPresentationStarted
// PresentationFrameManager::SetScreenAvailabilityListener
// * Destroy the instance in:
// PresentationFrameManager::Reset
@@ -138,11 +138,11 @@ class PresentationFrame {
const MediaSource::Id& source_id) const;
std::string GetDefaultPresentationId() const;
void ListenForConnectionStateChange(
- const content::PresentationSessionInfo& connection,
+ const content::PresentationInfo& connection,
const content::PresentationConnectionStateChangedCallback&
state_changed_cb);
- void ListenForSessionMessages(
- const content::PresentationSessionInfo& session,
+ void ListenForConnectionMessages(
+ const content::PresentationInfo& presentation_info,
const content::PresentationConnectionMessageCallback& message_cb);
void Reset();
@@ -151,13 +151,13 @@ class PresentationFrame {
const MediaRoute::Id GetRouteId(const std::string& presentation_id) const;
- void OnPresentationSessionStarted(
- const content::PresentationSessionInfo& session,
+ void OnPresentationConnection(
+ const content::PresentationInfo& presentation_info,
const MediaRoute& route);
void OnPresentationServiceDelegateDestroyed() const;
void ConnectToPresentation(
- const content::PresentationSessionInfo& session,
+ const content::PresentationInfo& presentation_info,
content::PresentationConnectionPtr controller_connection_ptr,
content::PresentationConnectionRequest receiver_connection_request);
@@ -172,10 +172,9 @@ class PresentationFrame {
MediaRoute::Id,
std::unique_ptr<PresentationConnectionStateSubscription>>
connection_state_subscriptions_;
- std::unordered_map<
- MediaRoute::Id,
- std::unique_ptr<PresentationSessionMessagesObserver>>
- session_messages_observers_;
+ std::unordered_map<MediaRoute::Id,
+ std::unique_ptr<PresentationConnectionMessagesObserver>>
+ connection_messages_observers_;
std::unordered_map<MediaRoute::Id,
std::unique_ptr<BrowserPresentationConnectionProxy>>
browser_connection_proxies_;
@@ -201,11 +200,11 @@ PresentationFrame::PresentationFrame(
PresentationFrame::~PresentationFrame() {
}
-void PresentationFrame::OnPresentationSessionStarted(
- const content::PresentationSessionInfo& session,
+void PresentationFrame::OnPresentationConnection(
+ const content::PresentationInfo& presentation_info,
const MediaRoute& route) {
presentation_id_to_route_.insert(
- std::make_pair(session.presentation_id, route));
+ std::make_pair(presentation_info.presentation_id, route));
}
const MediaRoute::Id PresentationFrame::GetRouteId(
@@ -269,7 +268,7 @@ void PresentationFrame::Reset() {
presentation_id_to_route_.clear();
url_to_sinks_observer_.clear();
connection_state_subscriptions_.clear();
- session_messages_observers_.clear();
+ connection_messages_observers_.clear();
browser_connection_proxies_.clear();
}
@@ -279,7 +278,7 @@ void PresentationFrame::RemoveConnection(const std::string& presentation_id,
presentation_id_to_route_.erase(presentation_id);
// We no longer need to observe route messages.
- session_messages_observers_.erase(route_id);
+ connection_messages_observers_.erase(route_id);
browser_connection_proxies_.erase(route_id);
// We keep the PresentationConnectionStateChangedCallback registered with MR
@@ -287,7 +286,7 @@ void PresentationFrame::RemoveConnection(const std::string& presentation_id,
}
void PresentationFrame::ListenForConnectionStateChange(
- const content::PresentationSessionInfo& connection,
+ const content::PresentationInfo& connection,
const content::PresentationConnectionStateChangedCallback&
state_changed_cb) {
auto it = presentation_id_to_route_.find(connection.presentation_id);
@@ -311,33 +310,33 @@ void PresentationFrame::ListenForConnectionStateChange(
route_id, state_changed_cb)));
}
-void PresentationFrame::ListenForSessionMessages(
- const content::PresentationSessionInfo& session,
+void PresentationFrame::ListenForConnectionMessages(
+ const content::PresentationInfo& presentation_info,
const content::PresentationConnectionMessageCallback& message_cb) {
- auto it = presentation_id_to_route_.find(session.presentation_id);
+ auto it = presentation_id_to_route_.find(presentation_info.presentation_id);
if (it == presentation_id_to_route_.end()) {
- DVLOG(2) << "ListenForSessionMessages: no route for "
- << session.presentation_id;
+ DVLOG(2) << "ListenForConnectionMessages: no route for "
+ << presentation_info.presentation_id;
return;
}
if (it->second.is_offscreen_presentation()) {
- DVLOG(2) << "ListenForSessionMessages: do not listen for offscreen "
- << "presentation [id]: " << session.presentation_id;
+ DVLOG(2) << "ListenForConnectionMessages: do not listen for offscreen "
+ << "presentation [id]: " << presentation_info.presentation_id;
return;
}
const MediaRoute::Id& route_id = it->second.media_route_id();
- if (session_messages_observers_.find(route_id) !=
- session_messages_observers_.end()) {
+ if (connection_messages_observers_.find(route_id) !=
+ connection_messages_observers_.end()) {
DLOG(ERROR) << __func__
- << "Already listening for session messages for route: "
+ << "Already listening for connection messages for route: "
<< route_id;
return;
}
- session_messages_observers_.insert(std::make_pair(
- route_id, base::MakeUnique<PresentationSessionMessagesObserver>(
+ connection_messages_observers_.insert(std::make_pair(
+ route_id, base::MakeUnique<PresentationConnectionMessagesObserver>(
router_, route_id, message_cb)));
}
@@ -350,15 +349,15 @@ MediaSource PresentationFrame::GetMediaSourceFromListener(
}
void PresentationFrame::ConnectToPresentation(
- const content::PresentationSessionInfo& session,
+ const content::PresentationInfo& presentation_info,
content::PresentationConnectionPtr controller_connection_ptr,
content::PresentationConnectionRequest receiver_connection_request) {
const auto pid_route_it =
- presentation_id_to_route_.find(session.presentation_id);
+ presentation_id_to_route_.find(presentation_info.presentation_id);
if (pid_route_it == presentation_id_to_route_.end()) {
DLOG(WARNING) << "No route for [presentation_id]: "
- << session.presentation_id;
+ << presentation_info.presentation_id;
return;
}
@@ -367,13 +366,13 @@ void PresentationFrame::ConnectToPresentation(
OffscreenPresentationManagerFactory::GetOrCreateForWebContents(
web_contents_);
offscreen_presentation_manager->RegisterOffscreenPresentationController(
- session.presentation_id, session.presentation_url,
+ presentation_info.presentation_id, presentation_info.presentation_url,
render_frame_host_id_, std::move(controller_connection_ptr),
std::move(receiver_connection_request), pid_route_it->second);
} else {
DVLOG(2)
<< "Creating BrowserPresentationConnectionProxy for [presentation_id]: "
- << session.presentation_id;
+ << presentation_info.presentation_id;
MediaRoute::Id route_id = pid_route_it->second.media_route_id();
auto* proxy = new BrowserPresentationConnectionProxy(
router_, route_id, std::move(receiver_connection_request),
@@ -400,12 +399,12 @@ class PresentationFrameManager {
content::PresentationScreenAvailabilityListener* listener);
void ListenForConnectionStateChange(
const RenderFrameHostId& render_frame_host_id,
- const content::PresentationSessionInfo& connection,
+ const content::PresentationInfo& connection,
const content::PresentationConnectionStateChangedCallback&
state_changed_cb);
- void ListenForSessionMessages(
+ void ListenForConnectionMessages(
const RenderFrameHostId& render_frame_host_id,
- const content::PresentationSessionInfo& session,
+ const content::PresentationInfo& presentation_info,
const content::PresentationConnectionMessageCallback& message_cb);
// Sets or clears the default presentation request and callback for the given
@@ -414,7 +413,7 @@ class PresentationFrameManager {
void SetDefaultPresentationUrls(
const RenderFrameHostId& render_frame_host_id,
const std::vector<GURL>& default_presentation_urls,
- const content::PresentationSessionStartedCallback& callback);
+ const content::PresentationConnectionCallback& callback);
void AddDelegateObserver(const RenderFrameHostId& render_frame_host_id,
DelegateObserver* observer);
void RemoveDelegateObserver(const RenderFrameHostId& render_frame_host_id);
@@ -433,18 +432,18 @@ class PresentationFrameManager {
const MediaSource::Id& source_id) const;
void SetMediaRouterForTest(MediaRouter* router);
- void OnPresentationSessionStarted(
+ void OnPresentationConnection(
const RenderFrameHostId& render_frame_host_id,
- const content::PresentationSessionInfo& session,
+ const content::PresentationInfo& presentation_info,
const MediaRoute& route);
- void OnDefaultPresentationSessionStarted(
+ void OnDefaultPresentationStarted(
const PresentationRequest& request,
- const content::PresentationSessionInfo& session,
+ const content::PresentationInfo& presentation_info,
const MediaRoute& route);
void ConnectToPresentation(
const RenderFrameHostId& render_frame_host_id,
- const content::PresentationSessionInfo& session,
+ const content::PresentationInfo& presentation_info,
content::PresentationConnectionPtr controller_connection_ptr,
content::PresentationConnectionRequest receiver_connection_request);
@@ -481,7 +480,7 @@ class PresentationFrameManager {
std::unique_ptr<PresentationRequest> default_presentation_request_;
// Callback to invoke when default presentation has started.
- content::PresentationSessionStartedCallback
+ content::PresentationConnectionCallback
default_presentation_started_callback_;
// References to the observers listening for changes to this tab WebContent's
@@ -505,34 +504,35 @@ PresentationFrameManager::PresentationFrameManager(
PresentationFrameManager::~PresentationFrameManager() {}
-void PresentationFrameManager::OnPresentationSessionStarted(
+void PresentationFrameManager::OnPresentationConnection(
const RenderFrameHostId& render_frame_host_id,
- const content::PresentationSessionInfo& session,
+ const content::PresentationInfo& presentation_info,
const MediaRoute& route) {
auto* presentation_frame = GetOrAddPresentationFrame(render_frame_host_id);
- presentation_frame->OnPresentationSessionStarted(session, route);
+ presentation_frame->OnPresentationConnection(presentation_info, route);
}
-void PresentationFrameManager::OnDefaultPresentationSessionStarted(
+void PresentationFrameManager::OnDefaultPresentationStarted(
const PresentationRequest& request,
- const content::PresentationSessionInfo& session,
+ const content::PresentationInfo& presentation_info,
const MediaRoute& route) {
- OnPresentationSessionStarted(request.render_frame_host_id(), session, route);
+ OnPresentationConnection(request.render_frame_host_id(), presentation_info,
+ route);
if (default_presentation_request_ &&
default_presentation_request_->Equals(request)) {
- default_presentation_started_callback_.Run(session);
+ default_presentation_started_callback_.Run(presentation_info);
}
}
void PresentationFrameManager::ConnectToPresentation(
const RenderFrameHostId& render_frame_host_id,
- const content::PresentationSessionInfo& session,
+ const content::PresentationInfo& presentation_info,
content::PresentationConnectionPtr controller_connection_ptr,
content::PresentationConnectionRequest receiver_connection_request) {
auto* presentation_frame = GetOrAddPresentationFrame(render_frame_host_id);
presentation_frame->ConnectToPresentation(
- session, std::move(controller_connection_ptr),
+ presentation_info, std::move(controller_connection_ptr),
std::move(receiver_connection_request));
}
@@ -572,7 +572,7 @@ bool PresentationFrameManager::HasScreenAvailabilityListenerForTest(
void PresentationFrameManager::ListenForConnectionStateChange(
const RenderFrameHostId& render_frame_host_id,
- const content::PresentationSessionInfo& connection,
+ const content::PresentationInfo& connection,
const content::PresentationConnectionStateChangedCallback&
state_changed_cb) {
const auto it = presentation_frames_.find(render_frame_host_id);
@@ -580,24 +580,24 @@ void PresentationFrameManager::ListenForConnectionStateChange(
it->second->ListenForConnectionStateChange(connection, state_changed_cb);
}
-void PresentationFrameManager::ListenForSessionMessages(
+void PresentationFrameManager::ListenForConnectionMessages(
const RenderFrameHostId& render_frame_host_id,
- const content::PresentationSessionInfo& session,
+ const content::PresentationInfo& presentation_info,
const content::PresentationConnectionMessageCallback& message_cb) {
const auto it = presentation_frames_.find(render_frame_host_id);
if (it == presentation_frames_.end()) {
- DVLOG(2) << "ListenForSessionMessages: PresentationFrame does not exist "
+ DVLOG(2) << "ListenForConnectionMessages: PresentationFrame does not exist "
<< "for: (" << render_frame_host_id.first << ", "
<< render_frame_host_id.second << ")";
return;
}
- it->second->ListenForSessionMessages(session, message_cb);
+ it->second->ListenForConnectionMessages(presentation_info, message_cb);
}
void PresentationFrameManager::SetDefaultPresentationUrls(
const RenderFrameHostId& render_frame_host_id,
const std::vector<GURL>& default_presentation_urls,
- const content::PresentationSessionStartedCallback& callback) {
+ const content::PresentationConnectionCallback& callback) {
if (!IsMainFrame(render_frame_host_id))
return;
@@ -756,7 +756,7 @@ void PresentationServiceDelegateImpl::SetDefaultPresentationUrls(
int render_process_id,
int render_frame_id,
const std::vector<GURL>& default_presentation_urls,
- const content::PresentationSessionStartedCallback& callback) {
+ const content::PresentationConnectionCallback& callback) {
RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id);
frame_manager_->SetDefaultPresentationUrls(
render_frame_host_id, default_presentation_urls, callback);
@@ -767,8 +767,8 @@ void PresentationServiceDelegateImpl::OnJoinRouteResponse(
int render_frame_id,
const GURL& presentation_url,
const std::string& presentation_id,
- const content::PresentationSessionStartedCallback& success_cb,
- const content::PresentationSessionErrorCallback& error_cb,
+ const content::PresentationConnectionCallback& success_cb,
+ const content::PresentationConnectionErrorCallback& error_cb,
const RouteRequestResult& result) {
if (!result.route()) {
error_cb.Run(content::PresentationError(
@@ -779,37 +779,37 @@ void PresentationServiceDelegateImpl::OnJoinRouteResponse(
<< ", presentation URL: " << presentation_url
<< ", presentation ID: " << presentation_id;
DCHECK_EQ(presentation_id, result.presentation_id());
- content::PresentationSessionInfo session(presentation_url,
- result.presentation_id());
- frame_manager_->OnPresentationSessionStarted(
- RenderFrameHostId(render_process_id, render_frame_id), session,
- *result.route());
- success_cb.Run(session);
+ content::PresentationInfo presentation_info(presentation_url,
+ result.presentation_id());
+ frame_manager_->OnPresentationConnection(
+ RenderFrameHostId(render_process_id, render_frame_id),
+ presentation_info, *result.route());
+ success_cb.Run(presentation_info);
}
}
-void PresentationServiceDelegateImpl::OnStartSessionSucceeded(
+void PresentationServiceDelegateImpl::OnStartPresentationSucceeded(
int render_process_id,
int render_frame_id,
- const content::PresentationSessionStartedCallback& success_cb,
- const content::PresentationSessionInfo& new_session,
+ const content::PresentationConnectionCallback& success_cb,
+ const content::PresentationInfo& new_presentation_info,
const MediaRoute& route) {
- DVLOG(1) << "OnStartSessionSucceeded: "
+ DVLOG(1) << "OnStartPresentationSucceeded: "
<< "route_id: " << route.media_route_id()
- << ", presentation URL: " << new_session.presentation_url
- << ", presentation ID: " << new_session.presentation_id;
- frame_manager_->OnPresentationSessionStarted(
- RenderFrameHostId(render_process_id, render_frame_id), new_session,
- route);
- success_cb.Run(new_session);
+ << ", presentation URL: " << new_presentation_info.presentation_url
+ << ", presentation ID: " << new_presentation_info.presentation_id;
+ frame_manager_->OnPresentationConnection(
+ RenderFrameHostId(render_process_id, render_frame_id),
+ new_presentation_info, route);
+ success_cb.Run(new_presentation_info);
}
-void PresentationServiceDelegateImpl::StartSession(
+void PresentationServiceDelegateImpl::StartPresentation(
int render_process_id,
int render_frame_id,
const std::vector<GURL>& presentation_urls,
- const content::PresentationSessionStartedCallback& success_cb,
- const content::PresentationSessionErrorCallback& error_cb) {
+ const content::PresentationConnectionCallback& success_cb,
+ const content::PresentationConnectionErrorCallback& error_cb) {
if (presentation_urls.empty()) {
error_cb.Run(content::PresentationError(content::PRESENTATION_ERROR_UNKNOWN,
"Invalid presentation arguments."));
@@ -832,28 +832,30 @@ void PresentationServiceDelegateImpl::StartSession(
new CreatePresentationConnectionRequest(
render_frame_host_id, presentation_urls,
GetLastCommittedURLForFrame(render_frame_host_id),
- base::Bind(&PresentationServiceDelegateImpl::OnStartSessionSucceeded,
- weak_factory_.GetWeakPtr(), render_process_id,
- render_frame_id, success_cb),
+ base::Bind(
+ &PresentationServiceDelegateImpl::OnStartPresentationSucceeded,
+ weak_factory_.GetWeakPtr(), render_process_id, render_frame_id,
+ success_cb),
error_cb));
MediaRouterDialogController* controller =
MediaRouterDialogController::GetOrCreateForWebContents(web_contents_);
if (!controller->ShowMediaRouterDialogForPresentation(std::move(request))) {
- LOG(ERROR) << "Media router dialog already exists. Ignoring StartSession.";
+ LOG(ERROR)
+ << "Media router dialog already exists. Ignoring StartPresentation.";
error_cb.Run(content::PresentationError(content::PRESENTATION_ERROR_UNKNOWN,
"Unable to create dialog."));
return;
}
}
-void PresentationServiceDelegateImpl::JoinSession(
+void PresentationServiceDelegateImpl::ReconnectPresentation(
int render_process_id,
int render_frame_id,
const std::vector<GURL>& presentation_urls,
const std::string& presentation_id,
- const content::PresentationSessionStartedCallback& success_cb,
- const content::PresentationSessionErrorCallback& error_cb) {
- DVLOG(2) << "PresentationServiceDelegateImpl::JoinSession";
+ const content::PresentationConnectionCallback& success_cb,
+ const content::PresentationConnectionErrorCallback& error_cb) {
+ DVLOG(2) << "PresentationServiceDelegateImpl::ReconnectPresentation";
if (presentation_urls.empty()) {
error_cb.Run(content::PresentationError(
content::PRESENTATION_ERROR_NO_PRESENTATION_FOUND,
@@ -868,7 +870,7 @@ void PresentationServiceDelegateImpl::JoinSession(
if (IsAutoJoinPresentationId(presentation_id) &&
ShouldCancelAutoJoinForOrigin(origin)) {
error_cb.Run(content::PresentationError(
- content::PRESENTATION_ERROR_SESSION_REQUEST_CANCELLED,
+ content::PRESENTATION_ERROR_PRESENTATION_REQUEST_CANCELLED,
"Auto-join request cancelled by user preferences."));
return;
}
@@ -960,24 +962,24 @@ void PresentationServiceDelegateImpl::Terminate(
void PresentationServiceDelegateImpl::ListenForConnectionMessages(
int render_process_id,
int render_frame_id,
- const content::PresentationSessionInfo& session,
+ const content::PresentationInfo& presentation_info,
const content::PresentationConnectionMessageCallback& message_cb) {
- frame_manager_->ListenForSessionMessages(
- RenderFrameHostId(render_process_id, render_frame_id), session,
+ frame_manager_->ListenForConnectionMessages(
+ RenderFrameHostId(render_process_id, render_frame_id), presentation_info,
message_cb);
}
void PresentationServiceDelegateImpl::SendMessage(
int render_process_id,
int render_frame_id,
- const content::PresentationSessionInfo& session,
+ const content::PresentationInfo& presentation_info,
content::PresentationConnectionMessage message,
const SendMessageCallback& send_message_cb) {
const MediaRoute::Id& route_id = frame_manager_->GetRouteId(
RenderFrameHostId(render_process_id, render_frame_id),
- session.presentation_id);
+ presentation_info.presentation_id);
if (route_id.empty()) {
- DVLOG(1) << "No active route for " << session.presentation_id;
+ DVLOG(1) << "No active route for " << presentation_info.presentation_id;
send_message_cb.Run(false);
return;
}
@@ -996,7 +998,7 @@ void PresentationServiceDelegateImpl::SendMessage(
void PresentationServiceDelegateImpl::ListenForConnectionStateChange(
int render_process_id,
int render_frame_id,
- const content::PresentationSessionInfo& connection,
+ const content::PresentationInfo& connection,
const content::PresentationConnectionStateChangedCallback&
state_changed_cb) {
frame_manager_->ListenForConnectionStateChange(
@@ -1007,11 +1009,11 @@ void PresentationServiceDelegateImpl::ListenForConnectionStateChange(
void PresentationServiceDelegateImpl::ConnectToPresentation(
int render_process_id,
int render_frame_id,
- const content::PresentationSessionInfo& session,
+ const content::PresentationInfo& presentation_info,
content::PresentationConnectionPtr controller_connection_ptr,
content::PresentationConnectionRequest receiver_connection_request) {
RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id);
- frame_manager_->ConnectToPresentation(render_frame_host_id, session,
+ frame_manager_->ConnectToPresentation(render_frame_host_id, presentation_info,
std::move(controller_connection_ptr),
std::move(receiver_connection_request));
}
@@ -1025,10 +1027,10 @@ void PresentationServiceDelegateImpl::OnRouteResponse(
return;
}
- content::PresentationSessionInfo session_info(result.presentation_url(),
- result.presentation_id());
- frame_manager_->OnDefaultPresentationSessionStarted(
- presentation_request, session_info, *result.route());
+ content::PresentationInfo presentation_info(result.presentation_url(),
+ result.presentation_id());
+ frame_manager_->OnDefaultPresentationStarted(
+ presentation_request, presentation_info, *result.route());
}
void PresentationServiceDelegateImpl::AddDefaultPresentationRequestObserver(

Powered by Google App Engine
This is Rietveld 408576698