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

Side by Side Diff: content/browser/presentation/presentation_service_impl.h

Issue 2174693004: [Presentation API] Add support to content/ for multiple URLs per PresentationRequest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated unittests. Created 4 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_PRESENTATION_PRESENTATION_SERVICE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_PRESENTATION_PRESENTATION_SERVICE_IMPL_H_
6 #define CONTENT_BROWSER_PRESENTATION_PRESENTATION_SERVICE_IMPL_H_ 6 #define CONTENT_BROWSER_PRESENTATION_PRESENTATION_SERVICE_IMPL_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <memory> 10 #include <memory>
11 #include <string> 11 #include <string>
12 #include <vector>
12 13
13 #include "base/callback.h" 14 #include "base/callback.h"
14 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
15 #include "base/containers/hash_tables.h" 16 #include "base/containers/hash_tables.h"
16 #include "base/gtest_prod_util.h" 17 #include "base/gtest_prod_util.h"
17 #include "base/macros.h" 18 #include "base/macros.h"
18 #include "base/memory/linked_ptr.h" 19 #include "base/memory/linked_ptr.h"
19 #include "base/memory/scoped_vector.h" 20 #include "base/memory/scoped_vector.h"
20 #include "base/memory/weak_ptr.h" 21 #include "base/memory/weak_ptr.h"
21 #include "content/common/content_export.h" 22 #include "content/common/content_export.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 friend class PresentationServiceImplTest; 65 friend class PresentationServiceImplTest;
65 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, Reset); 66 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, Reset);
66 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, DidNavigateThisFrame); 67 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, DidNavigateThisFrame);
67 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, 68 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
68 DidNavigateOtherFrame); 69 DidNavigateOtherFrame);
69 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, ThisRenderFrameDeleted); 70 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, ThisRenderFrameDeleted);
70 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, 71 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
71 OtherRenderFrameDeleted); 72 OtherRenderFrameDeleted);
72 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, DelegateFails); 73 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, DelegateFails);
73 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, 74 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
74 SetDefaultPresentationUrl); 75 SetDefaultPresentationUrls);
75 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, 76 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
76 SetSameDefaultPresentationUrl); 77 SetSameDefaultPresentationUrls);
77 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, 78 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
78 ClearDefaultPresentationUrl); 79 ClearDefaultPresentationUrls);
79 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, 80 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
80 ListenForDefaultSessionStart); 81 ListenForDefaultSessionStart);
81 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, 82 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
82 ListenForDefaultSessionStartAfterSet); 83 ListenForDefaultSessionStartAfterSet);
83 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, 84 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
84 DefaultSessionStartReset); 85 DefaultSessionStartReset);
85 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, 86 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
86 ReceiveSessionMessagesAfterReset); 87 ReceiveSessionMessagesAfterReset);
87 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, 88 FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
88 MaxPendingStartSessionRequests); 89 MaxPendingStartSessionRequests);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 // |render_frame_host|: The RFH this instance is associated with. 143 // |render_frame_host|: The RFH this instance is associated with.
143 // |web_contents|: The WebContents to observe. 144 // |web_contents|: The WebContents to observe.
144 // |delegate|: Where Presentation API requests are delegated to. Not owned 145 // |delegate|: Where Presentation API requests are delegated to. Not owned
145 // by this class. 146 // by this class.
146 PresentationServiceImpl( 147 PresentationServiceImpl(
147 RenderFrameHost* render_frame_host, 148 RenderFrameHost* render_frame_host,
148 WebContents* web_contents, 149 WebContents* web_contents,
149 PresentationServiceDelegate* delegate); 150 PresentationServiceDelegate* delegate);
150 151
151 // PresentationService implementation. 152 // PresentationService implementation.
152 void SetDefaultPresentationURL(const mojo::String& url) override; 153 void SetDefaultPresentationUrls(
154 mojo::Array<mojo::String> presentation_urls) override;
153 void SetClient(blink::mojom::PresentationServiceClientPtr client) override; 155 void SetClient(blink::mojom::PresentationServiceClientPtr client) override;
154 void ListenForScreenAvailability(const mojo::String& url) override; 156 void ListenForScreenAvailability(const mojo::String& url) override;
155 void StopListeningForScreenAvailability(const mojo::String& url) override; 157 void StopListeningForScreenAvailability(const mojo::String& url) override;
156 void StartSession( 158 void StartSession(mojo::Array<mojo::String> presentation_urls,
157 const mojo::String& presentation_url, 159 const NewSessionCallback& callback) override;
158 const NewSessionCallback& callback) override; 160 void JoinSession(mojo::Array<mojo::String> presentation_urls,
159 void JoinSession( 161 const mojo::String& presentation_id,
160 const mojo::String& presentation_url, 162 const NewSessionCallback& callback) override;
161 const mojo::String& presentation_id,
162 const NewSessionCallback& callback) override;
163 void SendSessionMessage(blink::mojom::PresentationSessionInfoPtr session_info, 163 void SendSessionMessage(blink::mojom::PresentationSessionInfoPtr session_info,
164 blink::mojom::SessionMessagePtr session_message, 164 blink::mojom::SessionMessagePtr session_message,
165 const SendSessionMessageCallback& callback) override; 165 const SendSessionMessageCallback& callback) override;
166 void CloseConnection(const mojo::String& presentation_url, 166 void CloseConnection(const mojo::String& presentation_url,
167 const mojo::String& presentation_id) override; 167 const mojo::String& presentation_id) override;
168 void Terminate(const mojo::String& presentation_url, 168 void Terminate(const mojo::String& presentation_url,
169 const mojo::String& presentation_id) override; 169 const mojo::String& presentation_id) override;
170 void ListenForSessionMessages( 170 void ListenForSessionMessages(
171 blink::mojom::PresentationSessionInfoPtr session) override; 171 blink::mojom::PresentationSessionInfoPtr session) override;
172 172
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 bool FrameMatches(content::RenderFrameHost* render_frame_host) const; 247 bool FrameMatches(content::RenderFrameHost* render_frame_host) const;
248 248
249 // Embedder-specific delegate to forward Presentation requests to. 249 // Embedder-specific delegate to forward Presentation requests to.
250 // May be null if embedder does not support Presentation API. 250 // May be null if embedder does not support Presentation API.
251 PresentationServiceDelegate* delegate_; 251 PresentationServiceDelegate* delegate_;
252 252
253 // Proxy to the PresentationServiceClient to send results (e.g., screen 253 // Proxy to the PresentationServiceClient to send results (e.g., screen
254 // availability) to. 254 // availability) to.
255 blink::mojom::PresentationServiceClientPtr client_; 255 blink::mojom::PresentationServiceClientPtr client_;
256 256
257 std::string default_presentation_url_; 257 std::vector<std::string> default_presentation_urls_;
258 258
259 using ScreenAvailabilityListenerMap = 259 using ScreenAvailabilityListenerMap =
260 std::map<std::string, std::unique_ptr<ScreenAvailabilityListenerImpl>>; 260 std::map<std::string, std::unique_ptr<ScreenAvailabilityListenerImpl>>;
261 ScreenAvailabilityListenerMap screen_availability_listeners_; 261 ScreenAvailabilityListenerMap screen_availability_listeners_;
262 262
263 // For StartSession requests. 263 // For StartSession requests.
264 // Set to a positive value when a StartSession request is being processed. 264 // Set to a positive value when a StartSession request is being processed.
265 int start_session_request_id_; 265 int start_session_request_id_;
266 std::unique_ptr<NewSessionCallbackWrapper> pending_start_session_cb_; 266 std::unique_ptr<NewSessionCallbackWrapper> pending_start_session_cb_;
267 267
(...skipping 16 matching lines...) Expand all
284 284
285 // NOTE: Weak pointers must be invalidated before all other member variables. 285 // NOTE: Weak pointers must be invalidated before all other member variables.
286 base::WeakPtrFactory<PresentationServiceImpl> weak_factory_; 286 base::WeakPtrFactory<PresentationServiceImpl> weak_factory_;
287 287
288 DISALLOW_COPY_AND_ASSIGN(PresentationServiceImpl); 288 DISALLOW_COPY_AND_ASSIGN(PresentationServiceImpl);
289 }; 289 };
290 290
291 } // namespace content 291 } // namespace content
292 292
293 #endif // CONTENT_BROWSER_PRESENTATION_PRESENTATION_SERVICE_IMPL_H_ 293 #endif // CONTENT_BROWSER_PRESENTATION_PRESENTATION_SERVICE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698