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

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

Issue 1436703002: Revert of [Presentation API / Media Router] Clean up default pres URL logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
deleted file mode 100644
index 024dd1bcfdd60b226a3d3294b082d63621eee047..0000000000000000000000000000000000000000
--- a/chrome/browser/media/router/create_presentation_connection_request.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_MEDIA_ROUTER_CREATE_PRESENTATION_CONNECTION_REQUEST_H_
-#define CHROME_BROWSER_MEDIA_ROUTER_CREATE_PRESENTATION_CONNECTION_REQUEST_H_
-
-#include <string>
-
-#include "base/macros.h"
-#include "chrome/browser/media/router/media_route.h"
-#include "chrome/browser/media/router/media_source.h"
-#include "chrome/browser/media/router/presentation_request.h"
-#include "chrome/browser/media/router/render_frame_host_id.h"
-#include "content/public/browser/presentation_service_delegate.h"
-#include "url/gurl.h"
-
-namespace content {
-struct PresentationError;
-struct PresentationSessionInfo;
-} // namespace content
-
-namespace media_router {
-
-// 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.
-class CreatePresentationConnectionRequest {
- public:
- using PresentationSessionSuccessCallback =
- base::Callback<void(const content::PresentationSessionInfo&,
- const MediaRoute::Id&)>;
- using PresentationSessionErrorCallback =
- content::PresentationSessionErrorCallback;
- // |presentation_url|: The presentation URL of the request. Must be a valid
- // URL.
- // |frame_url|: The URL of the frame that initiated the presentation request.
- // |success_cb|: Callback to invoke when the request succeeds. Must be valid.
- // |erorr_cb|: Callback to invoke when the request fails. Must be valid.
- CreatePresentationConnectionRequest(
- const RenderFrameHostId& render_frame_host_id,
- const std::string& presentation_url,
- const GURL& frame_url,
- const PresentationSessionSuccessCallback& success_cb,
- const PresentationSessionErrorCallback& error_cb);
- ~CreatePresentationConnectionRequest();
-
- const PresentationRequest& presentation_request() const {
- return presentation_request_;
- }
-
- // Invokes |success_cb_| or |error_cb_| with the given arguments.
- // These functions can only be invoked once per instance. It is an error
- // to invoke these functions more than once.
- void InvokeSuccessCallback(const std::string& presentation_id,
- const MediaRoute::Id& route_id);
- void InvokeErrorCallback(const content::PresentationError& error);
-
- // Handle route creation/joining response by invoking the right callback.
- static void HandleRouteResponse(
- scoped_ptr<CreatePresentationConnectionRequest> presentation_request,
- const MediaRoute* route,
- const std::string& presentation_id,
- const std::string& error);
-
- private:
- const PresentationRequest presentation_request_;
- PresentationSessionSuccessCallback success_cb_;
- PresentationSessionErrorCallback error_cb_;
- bool cb_invoked_;
-
- DISALLOW_COPY_AND_ASSIGN(CreatePresentationConnectionRequest);
-};
-
-} // namespace media_router
-
-#endif // CHROME_BROWSER_MEDIA_ROUTER_CREATE_PRESENTATION_CONNECTION_REQUEST_H_

Powered by Google App Engine
This is Rietveld 408576698