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

Side by Side Diff: chrome/browser/media/android/router/media_router_android.h

Issue 2627463003: Convert MediaRouter mojom apis to intake url::Origin objects instead of strings (Closed)
Patch Set: Add missing dependency for extensions_renderer_resources target 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/media/android/router/media_router_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ 5 #ifndef CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
6 #define CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ 6 #define CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 17 matching lines...) Expand all
28 public: 28 public:
29 ~MediaRouterAndroid() override; 29 ~MediaRouterAndroid() override;
30 30
31 static bool Register(JNIEnv* env); 31 static bool Register(JNIEnv* env);
32 32
33 const MediaRoute* FindRouteBySource(const MediaSource::Id& source_id) const; 33 const MediaRoute* FindRouteBySource(const MediaSource::Id& source_id) const;
34 34
35 // MediaRouter implementation. 35 // MediaRouter implementation.
36 void CreateRoute(const MediaSource::Id& source_id, 36 void CreateRoute(const MediaSource::Id& source_id,
37 const MediaSink::Id& sink_id, 37 const MediaSink::Id& sink_id,
38 const GURL& origin, 38 const url::Origin& origin,
39 content::WebContents* web_contents, 39 content::WebContents* web_contents,
40 const std::vector<MediaRouteResponseCallback>& callbacks, 40 const std::vector<MediaRouteResponseCallback>& callbacks,
41 base::TimeDelta timeout, 41 base::TimeDelta timeout,
42 bool incognito) override; 42 bool incognito) override;
43 void JoinRoute(const MediaSource::Id& source, 43 void JoinRoute(const MediaSource::Id& source,
44 const std::string& presentation_id, 44 const std::string& presentation_id,
45 const GURL& origin, 45 const url::Origin& origin,
46 content::WebContents* web_contents, 46 content::WebContents* web_contents,
47 const std::vector<MediaRouteResponseCallback>& callbacks, 47 const std::vector<MediaRouteResponseCallback>& callbacks,
48 base::TimeDelta timeout, 48 base::TimeDelta timeout,
49 bool incognito) override; 49 bool incognito) override;
50 void ConnectRouteByRouteId( 50 void ConnectRouteByRouteId(
51 const MediaSource::Id& source, 51 const MediaSource::Id& source,
52 const MediaRoute::Id& route_id, 52 const MediaRoute::Id& route_id,
53 const GURL& origin, 53 const url::Origin& origin,
54 content::WebContents* web_contents, 54 content::WebContents* web_contents,
55 const std::vector<MediaRouteResponseCallback>& callbacks, 55 const std::vector<MediaRouteResponseCallback>& callbacks,
56 base::TimeDelta timeout, 56 base::TimeDelta timeout,
57 bool incognito) override; 57 bool incognito) override;
58 void DetachRoute(const MediaRoute::Id& route_id) override; 58 void DetachRoute(const MediaRoute::Id& route_id) override;
59 void TerminateRoute(const MediaRoute::Id& route_id) override; 59 void TerminateRoute(const MediaRoute::Id& route_id) override;
60 void SendRouteMessage(const MediaRoute::Id& route_id, 60 void SendRouteMessage(const MediaRoute::Id& route_id,
61 const std::string& message, 61 const std::string& message,
62 const SendRouteMessageCallback& callback) override; 62 const SendRouteMessageCallback& callback) override;
63 void SendRouteBinaryMessage( 63 void SendRouteBinaryMessage(
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 MediaRoute::Id, 173 MediaRoute::Id,
174 std::unique_ptr<base::ObserverList<RouteMessageObserver>>>; 174 std::unique_ptr<base::ObserverList<RouteMessageObserver>>>;
175 MessageObservers message_observers_; 175 MessageObservers message_observers_;
176 176
177 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid); 177 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid);
178 }; 178 };
179 179
180 } // namespace media_router 180 } // namespace media_router
181 181
182 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ 182 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/android/router/media_router_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698