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

Side by Side Diff: chrome/browser/media/router/media_router_mojo_impl.h

Issue 1507743005: [MediaRouter] Renames CloseRoute() to Terminate() and creates DetachRoute() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android build Created 5 years 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 CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_ 5 #ifndef CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_
6 #define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_ 6 #define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 const MediaSink::Id& sink_id, 67 const MediaSink::Id& sink_id,
68 const GURL& origin, 68 const GURL& origin,
69 content::WebContents* web_contents, 69 content::WebContents* web_contents,
70 const std::vector<MediaRouteResponseCallback>& callbacks) override; 70 const std::vector<MediaRouteResponseCallback>& callbacks) override;
71 void JoinRoute( 71 void JoinRoute(
72 const MediaSource::Id& source_id, 72 const MediaSource::Id& source_id,
73 const std::string& presentation_id, 73 const std::string& presentation_id,
74 const GURL& origin, 74 const GURL& origin,
75 content::WebContents* web_contents, 75 content::WebContents* web_contents,
76 const std::vector<MediaRouteResponseCallback>& callbacks) override; 76 const std::vector<MediaRouteResponseCallback>& callbacks) override;
77 void CloseRoute(const MediaRoute::Id& route_id) override; 77 void TerminateRoute(const MediaRoute::Id& route_id) override;
78 void DetachRoute(const MediaRoute::Id& route_id) override;
78 void SendRouteMessage(const MediaRoute::Id& route_id, 79 void SendRouteMessage(const MediaRoute::Id& route_id,
79 const std::string& message, 80 const std::string& message,
80 const SendRouteMessageCallback& callback) override; 81 const SendRouteMessageCallback& callback) override;
81 void SendRouteBinaryMessage( 82 void SendRouteBinaryMessage(
82 const MediaRoute::Id& route_id, 83 const MediaRoute::Id& route_id,
83 scoped_ptr<std::vector<uint8>> data, 84 scoped_ptr<std::vector<uint8>> data,
84 const SendRouteMessageCallback& callback) override; 85 const SendRouteMessageCallback& callback) override;
85 void AddIssue(const Issue& issue) override; 86 void AddIssue(const Issue& issue) override;
86 void ClearIssue(const Issue::Id& issue_id) override; 87 void ClearIssue(const Issue::Id& issue_id) override;
87 void OnPresentationSessionDetached(const MediaRoute::Id& route_id) override;
88 bool HasLocalDisplayRoute() const override; 88 bool HasLocalDisplayRoute() const override;
89 89
90 const std::string& media_route_provider_extension_id() const { 90 const std::string& media_route_provider_extension_id() const {
91 return media_route_provider_extension_id_; 91 return media_route_provider_extension_id_;
92 } 92 }
93 93
94 void set_instance_id_for_test(const std::string& instance_id) { 94 void set_instance_id_for_test(const std::string& instance_id) {
95 instance_id_ = instance_id; 95 instance_id_ = instance_id;
96 } 96 }
97 97
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 void DoCreateRoute(const MediaSource::Id& source_id, 205 void DoCreateRoute(const MediaSource::Id& source_id,
206 const MediaSink::Id& sink_id, 206 const MediaSink::Id& sink_id,
207 const std::string& origin, 207 const std::string& origin,
208 int tab_id, 208 int tab_id,
209 const std::vector<MediaRouteResponseCallback>& callbacks); 209 const std::vector<MediaRouteResponseCallback>& callbacks);
210 void DoJoinRoute(const MediaSource::Id& source_id, 210 void DoJoinRoute(const MediaSource::Id& source_id,
211 const std::string& presentation_id, 211 const std::string& presentation_id,
212 const std::string& origin, 212 const std::string& origin,
213 int tab_id, 213 int tab_id,
214 const std::vector<MediaRouteResponseCallback>& callbacks); 214 const std::vector<MediaRouteResponseCallback>& callbacks);
215 void DoCloseRoute(const MediaRoute::Id& route_id); 215 void DoTerminateRoute(const MediaRoute::Id& route_id);
216 void DoDetachRoute(const MediaRoute::Id& route_id);
216 void DoSendSessionMessage(const MediaRoute::Id& route_id, 217 void DoSendSessionMessage(const MediaRoute::Id& route_id,
217 const std::string& message, 218 const std::string& message,
218 const SendRouteMessageCallback& callback); 219 const SendRouteMessageCallback& callback);
219 void DoSendSessionBinaryMessage(const MediaRoute::Id& route_id, 220 void DoSendSessionBinaryMessage(const MediaRoute::Id& route_id,
220 scoped_ptr<std::vector<uint8>> data, 221 scoped_ptr<std::vector<uint8>> data,
221 const SendRouteMessageCallback& callback); 222 const SendRouteMessageCallback& callback);
222 void DoListenForRouteMessages(const MediaRoute::Id& route_id); 223 void DoListenForRouteMessages(const MediaRoute::Id& route_id);
223 void DoStopListeningForRouteMessages(const MediaRoute::Id& route_id); 224 void DoStopListeningForRouteMessages(const MediaRoute::Id& route_id);
224 void DoOnPresentationSessionDetached(const MediaRoute::Id& route_id);
225 void DoStartObservingMediaSinks(const MediaSource::Id& source_id); 225 void DoStartObservingMediaSinks(const MediaSource::Id& source_id);
226 void DoStopObservingMediaSinks(const MediaSource::Id& source_id); 226 void DoStopObservingMediaSinks(const MediaSource::Id& source_id);
227 void DoStartObservingMediaRoutes(); 227 void DoStartObservingMediaRoutes();
228 void DoStopObservingMediaRoutes(); 228 void DoStopObservingMediaRoutes();
229 229
230 // Invoked when the next batch of messages arrives. 230 // Invoked when the next batch of messages arrives.
231 // |route_id|: ID of route of the messages. 231 // |route_id|: ID of route of the messages.
232 // |messages|: A list of messages received. 232 // |messages|: A list of messages received.
233 // |error|: true if an error occurred. 233 // |error|: true if an error occurred.
234 void OnRouteMessagesReceived( 234 void OnRouteMessagesReceived(
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 MediaRouteProviderWakeReason current_wake_reason_; 354 MediaRouteProviderWakeReason current_wake_reason_;
355 355
356 base::WeakPtrFactory<MediaRouterMojoImpl> weak_factory_; 356 base::WeakPtrFactory<MediaRouterMojoImpl> weak_factory_;
357 357
358 DISALLOW_COPY_AND_ASSIGN(MediaRouterMojoImpl); 358 DISALLOW_COPY_AND_ASSIGN(MediaRouterMojoImpl);
359 }; 359 };
360 360
361 } // namespace media_router 361 } // namespace media_router
362 362
363 #endif // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_ 363 #endif // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/media/router/media_router_metrics.h ('k') | chrome/browser/media/router/media_router_mojo_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698