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

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

Issue 935083002: [PresentationAPI] Implementing start/joinSession from WebPresentationClient to PresentationService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: is_null() checks for StructPtr's instead of get() Created 5 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_dispatcher.h
diff --git a/content/renderer/presentation/presentation_dispatcher.h b/content/renderer/presentation/presentation_dispatcher.h
index caf1840f2e0b5eab0ae6dfb0b6cbbe6b6e50d779..fc0291c3a6da6573cb2bb0bc1e77ed89031aa2fd 100644
--- a/content/renderer/presentation/presentation_dispatcher.h
+++ b/content/renderer/presentation/presentation_dispatcher.h
@@ -6,9 +6,11 @@
#define CONTENT_RENDERER_PRESENTATION_PRESENTATION_DISPATCHER_H_
#include "base/compiler_specific.h"
+#include "base/memory/scoped_vector.h"
#include "content/common/content_export.h"
#include "content/common/presentation/presentation_service.mojom.h"
#include "content/public/renderer/render_frame_observer.h"
+#include "content/renderer/presentation/presentation_session_dispatcher.h"
#include "third_party/WebKit/public/platform/modules/presentation/WebPresentationClient.h"
namespace content {
@@ -27,14 +29,31 @@ class CONTENT_EXPORT PresentationDispatcher
virtual void setController(
blink::WebPresentationController* controller);
virtual void updateAvailableChangeWatched(bool watched);
+ virtual void startSession(
+ const blink::WebString& presentationUrl,
+ const blink::WebString& presentationId,
+ blink::WebPresentationSessionClientCallbacks* callback);
+ virtual void joinSession(
+ const blink::WebString& presentationUrl,
+ const blink::WebString& presentationId,
+ blink::WebPresentationSessionClientCallbacks* callback);
void OnScreenAvailabilityChanged(bool available);
+ void OnSessionCreated(
+ blink::WebPresentationSessionClientCallbacks* callback,
+ presentation::PresentationSessionInfoPtr session_info,
+ presentation::PresentationErrorPtr error);
void ConnectToPresentationServiceIfNeeded();
// Used as a weak reference. Can be null since lifetime is bound to the frame.
blink::WebPresentationController* controller_;
presentation::PresentationServicePtr presentation_service_;
+
+ // Wrappers around the PresentationSessionPtr corresponding to each Javascript
+ // PresentationSession object passed back to the frame.
+ typedef ScopedVector<PresentationSessionDispatcher> PresentationSessions;
mlamouri (slow - plz ping) 2015/02/23 14:07:39 using PresentationSessions = ScopedVector<Presenta
whywhat 2015/02/25 14:12:42 Done.
+ PresentationSessions presentation_sessions_;
};
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698