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

Unified Diff: chrome/browser/media/router/create_presentation_connection_request.h

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/create_presentation_connection_request.h
diff --git a/chrome/browser/media/router/create_presentation_connection_request.h b/chrome/browser/media/router/create_presentation_connection_request.h
index dc702af5c112de3c05f04ff9c75ed71e7131cb66..1422fe178724c6925b1f04ee9433ec3cc1fc23f3 100644
--- a/chrome/browser/media/router/create_presentation_connection_request.h
+++ b/chrome/browser/media/router/create_presentation_connection_request.h
@@ -18,7 +18,7 @@
namespace content {
struct PresentationError;
-struct PresentationSessionInfo;
+struct PresentationInfo;
} // namespace content
namespace url {
@@ -29,19 +29,16 @@ namespace media_router {
class RouteRequestResult;
-// Holds parameters for creating a presentation session.
-// A request object is created by presentation_service_delegate_impl when it
-// gets create-session request. The object is then passed to and owned by the
-// MediaRouterUI. |success_cb| will be invoked when create-session
-// succeeds, or |error_cb| will be invoked when create-session fails or
-// the UI closes.
+// Holds parameters for creating a presentation. A request object is created by
+// presentation_service_delegate_impl, which is then passed to and owned by the
+// MediaRouterUI. |success_cb| will be invoked when create-session succeeds, or
+// |error_cb| will be invoked when create-session fails or the UI closes.
class CreatePresentationConnectionRequest {
public:
- using PresentationSessionSuccessCallback =
- base::Callback<void(const content::PresentationSessionInfo&,
- const MediaRoute&)>;
- using PresentationSessionErrorCallback =
- content::PresentationSessionErrorCallback;
+ using PresentationConnectionCallback =
+ base::Callback<void(const content::PresentationInfo&, const MediaRoute&)>;
+ using PresentationConnectionErrorCallback =
+ content::PresentationConnectionErrorCallback;
// |presentation_url|: The presentation URL of the request. Must be a valid
// URL.
// |frame_origin|: The origin of the frame that initiated the presentation
@@ -52,8 +49,8 @@ class CreatePresentationConnectionRequest {
const RenderFrameHostId& render_frame_host_id,
const std::vector<GURL>& presentation_urls,
const url::Origin& frame_origin,
- const PresentationSessionSuccessCallback& success_cb,
- const PresentationSessionErrorCallback& error_cb);
+ const PresentationConnectionCallback& success_cb,
+ const PresentationConnectionErrorCallback& error_cb);
~CreatePresentationConnectionRequest();
const PresentationRequest& presentation_request() const {
@@ -75,8 +72,8 @@ class CreatePresentationConnectionRequest {
private:
const PresentationRequest presentation_request_;
- PresentationSessionSuccessCallback success_cb_;
- PresentationSessionErrorCallback error_cb_;
+ PresentationConnectionCallback success_cb_;
+ PresentationConnectionErrorCallback error_cb_;
bool cb_invoked_;
DISALLOW_COPY_AND_ASSIGN(CreatePresentationConnectionRequest);

Powered by Google App Engine
This is Rietveld 408576698