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

Unified Diff: content/renderer/presentation/presentation_dispatcher.h

Issue 2622993002: [Presentation API] Move presentation.mojom to content/common/presentation (Closed)
Patch Set: Fix presentation_service_delegate. DEPS failure Created 3 years, 11 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: content/renderer/presentation/presentation_dispatcher.h
diff --git a/content/renderer/presentation/presentation_dispatcher.h b/content/renderer/presentation/presentation_dispatcher.h
index ddcf5e6c821a2119e8576165d1dd6670d6043436..e47106a6be624ddd0bbadcfa9079aba628f76efc 100644
--- a/content/renderer/presentation/presentation_dispatcher.h
+++ b/content/renderer/presentation/presentation_dispatcher.h
@@ -19,10 +19,10 @@
#include "base/id_map.h"
#include "base/macros.h"
#include "content/common/content_export.h"
+#include "content/common/presentation/presentation.mojom.h"
#include "content/public/renderer/render_frame_observer.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "third_party/WebKit/public/platform/modules/presentation/WebPresentationClient.h"
-#include "third_party/WebKit/public/platform/modules/presentation/presentation.mojom.h"
#include "url/gurl.h"
namespace blink {
@@ -43,7 +43,7 @@ class TestPresentationDispatcher;
class CONTENT_EXPORT PresentationDispatcher
: public RenderFrameObserver,
public NON_EXPORTED_BASE(blink::WebPresentationClient),
- public NON_EXPORTED_BASE(blink::mojom::PresentationServiceClient) {
+ public NON_EXPORTED_BASE(content::mojom::PresentationServiceClient) {
public:
explicit PresentationDispatcher(RenderFrame* render_frame);
~PresentationDispatcher() override;
@@ -65,12 +65,12 @@ class CONTENT_EXPORT PresentationDispatcher
TestSetDefaultPresentationUrls);
struct SendMessageRequest {
- SendMessageRequest(blink::mojom::PresentationSessionInfoPtr session_info,
- blink::mojom::ConnectionMessagePtr message);
+ SendMessageRequest(content::mojom::PresentationSessionInfoPtr session_info,
+ content::mojom::ConnectionMessagePtr message);
~SendMessageRequest();
- blink::mojom::PresentationSessionInfoPtr session_info;
- blink::mojom::ConnectionMessagePtr message;
+ content::mojom::PresentationSessionInfoPtr session_info;
+ content::mojom::ConnectionMessagePtr message;
};
static SendMessageRequest* CreateSendTextMessageRequest(
@@ -80,7 +80,7 @@ class CONTENT_EXPORT PresentationDispatcher
static SendMessageRequest* CreateSendBinaryMessageRequest(
const blink::WebURL& presentationUrl,
const blink::WebString& presentationId,
- blink::mojom::PresentationMessageType type,
+ content::mojom::PresentationMessageType type,
const uint8_t* data,
size_t length);
@@ -125,30 +125,30 @@ class CONTENT_EXPORT PresentationDispatcher
bool is_same_page_navigation) override;
void OnDestruct() override;
- // blink::mojom::PresentationServiceClient
+ // content::mojom::PresentationServiceClient
void OnScreenAvailabilityNotSupported(const GURL& url) override;
void OnScreenAvailabilityUpdated(const GURL& url, bool available) override;
void OnConnectionStateChanged(
- blink::mojom::PresentationSessionInfoPtr session_info,
- blink::mojom::PresentationConnectionState state) override;
+ content::mojom::PresentationSessionInfoPtr session_info,
+ content::mojom::PresentationConnectionState state) override;
void OnConnectionClosed(
- blink::mojom::PresentationSessionInfoPtr session_info,
- blink::mojom::PresentationConnectionCloseReason reason,
+ content::mojom::PresentationSessionInfoPtr session_info,
+ content::mojom::PresentationConnectionCloseReason reason,
const std::string& message) override;
void OnConnectionMessagesReceived(
- blink::mojom::PresentationSessionInfoPtr session_info,
- std::vector<blink::mojom::ConnectionMessagePtr> messages) override;
+ content::mojom::PresentationSessionInfoPtr session_info,
+ std::vector<content::mojom::ConnectionMessagePtr> messages) override;
void OnDefaultSessionStarted(
- blink::mojom::PresentationSessionInfoPtr session_info) override;
+ content::mojom::PresentationSessionInfoPtr session_info) override;
void OnSessionCreated(
std::unique_ptr<blink::WebPresentationConnectionCallback> callback,
- blink::mojom::PresentationSessionInfoPtr session_info,
- blink::mojom::PresentationErrorPtr error);
+ content::mojom::PresentationSessionInfoPtr session_info,
+ content::mojom::PresentationErrorPtr error);
void OnReceiverConnectionAvailable(
- blink::mojom::PresentationSessionInfoPtr,
- blink::mojom::PresentationConnectionPtr,
- blink::mojom::PresentationConnectionRequest) override;
+ content::mojom::PresentationSessionInfoPtr,
+ content::mojom::PresentationConnectionPtr,
+ content::mojom::PresentationConnectionRequest) override;
// Call to PresentationService to send the message in |request|.
// |session_info| and |message| of |reuqest| will be consumed.
@@ -163,8 +163,8 @@ class CONTENT_EXPORT PresentationDispatcher
// Used as a weak reference. Can be null since lifetime is bound to the frame.
blink::WebPresentationController* controller_;
blink::WebPresentationReceiver* receiver_;
- blink::mojom::PresentationServicePtr presentation_service_;
- mojo::Binding<blink::mojom::PresentationServiceClient> binding_;
+ content::mojom::PresentationServicePtr presentation_service_;
+ mojo::Binding<content::mojom::PresentationServiceClient> binding_;
// Message requests are queued here and only one message at a time is sent
// over mojo channel.
« no previous file with comments | « content/public/common/presentation_session.cc ('k') | content/renderer/presentation/presentation_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698