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

Unified Diff: content/renderer/presentation/presentation_connection_proxy.cc

Issue 2613153003: [Presentation API] Replaces type converters with typemaps (Closed)
Patch Set: Extend presentation ID max length to 64. Created 3 years, 10 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_connection_proxy.cc
diff --git a/content/renderer/presentation/presentation_connection_proxy.cc b/content/renderer/presentation/presentation_connection_proxy.cc
index 93129afef855d4fab5d80a16c58154e39ca614e5..3b5f508755914103b64743aac1a8e67430b096da 100644
--- a/content/renderer/presentation/presentation_connection_proxy.cc
+++ b/content/renderer/presentation/presentation_connection_proxy.cc
@@ -5,6 +5,7 @@
#include "content/renderer/presentation/presentation_connection_proxy.h"
#include "base/logging.h"
+#include "content/public/common/presentation_session.h"
#include "content/renderer/presentation/presentation_dispatcher.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/modules/presentation/WebPresentationConnection.h"
@@ -61,8 +62,8 @@ void PresentationConnectionProxy::OnMessage(
// TODO(crbug.com/588874): Ensure legal PresentationConnection state transitions
// in a single place.
void PresentationConnectionProxy::DidChangeState(
- blink::mojom::PresentationConnectionState state) {
- if (state != blink::mojom::PresentationConnectionState::CONNECTED) {
+ content::PresentationConnectionState state) {
+ if (state != content::PRESENTATION_CONNECTION_STATE_CONNECTED) {
// |DidChangeState| should only handle state transition from connecting ->
// connected. PresentationService and MRP handles other state transitions.
NOTREACHED();
@@ -106,9 +107,9 @@ void ReceiverConnectionProxy::BindControllerConnection(
DCHECK(!target_connection_ptr_);
target_connection_ptr_ = std::move(controller_connection_ptr);
target_connection_ptr_->DidChangeState(
- blink::mojom::PresentationConnectionState::CONNECTED);
+ content::PRESENTATION_CONNECTION_STATE_CONNECTED);
- DidChangeState(blink::mojom::PresentationConnectionState::CONNECTED);
+ DidChangeState(content::PRESENTATION_CONNECTION_STATE_CONNECTED);
}
} // namespace content
« no previous file with comments | « content/renderer/presentation/presentation_connection_proxy.h ('k') | content/renderer/presentation/presentation_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698