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

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

Issue 1415103006: Non-Local Join for Media Router and Presentation API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing ChromeOS System Tray Test Created 4 years, 11 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 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 26 matching lines...) Expand all
37 const MediaSink::Id& sink_id, 37 const MediaSink::Id& sink_id,
38 const GURL& origin, 38 const GURL& origin,
39 content::WebContents* web_contents, 39 content::WebContents* web_contents,
40 const std::vector<MediaRouteResponseCallback>& callbacks) override; 40 const std::vector<MediaRouteResponseCallback>& callbacks) override;
41 void JoinRoute( 41 void JoinRoute(
42 const MediaSource::Id& source, 42 const MediaSource::Id& source,
43 const std::string& presentation_id, 43 const std::string& presentation_id,
44 const GURL& origin, 44 const GURL& origin,
45 content::WebContents* web_contents, 45 content::WebContents* web_contents,
46 const std::vector<MediaRouteResponseCallback>& callbacks) override; 46 const std::vector<MediaRouteResponseCallback>& callbacks) override;
47 void ConnectRouteByRouteId(
48 const MediaSource::Id& source,
49 const MediaRoute::Id& route_id,
50 const GURL& origin,
51 content::WebContents* web_contents,
52 const std::vector<MediaRouteResponseCallback>& callbacks) override;
47 void DetachRoute(const MediaRoute::Id& route_id) override; 53 void DetachRoute(const MediaRoute::Id& route_id) override;
48 void TerminateRoute(const MediaRoute::Id& route_id) override; 54 void TerminateRoute(const MediaRoute::Id& route_id) override;
49 void SendRouteMessage(const MediaRoute::Id& route_id, 55 void SendRouteMessage(const MediaRoute::Id& route_id,
50 const std::string& message, 56 const std::string& message,
51 const SendRouteMessageCallback& callback) override; 57 const SendRouteMessageCallback& callback) override;
52 void SendRouteBinaryMessage( 58 void SendRouteBinaryMessage(
53 const MediaRoute::Id& route_id, 59 const MediaRoute::Id& route_id,
54 scoped_ptr<std::vector<uint8_t>> data, 60 scoped_ptr<std::vector<uint8_t>> data,
55 const SendRouteMessageCallback& callback) override; 61 const SendRouteMessageCallback& callback) override;
56 void AddIssue(const Issue& issue) override; 62 void AddIssue(const Issue& issue) override;
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 MediaRoute::Id, 162 MediaRoute::Id,
157 scoped_ptr<base::ObserverList<PresentationSessionMessagesObserver>>>; 163 scoped_ptr<base::ObserverList<PresentationSessionMessagesObserver>>>;
158 MessagesObservers messages_observers_; 164 MessagesObservers messages_observers_;
159 165
160 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid); 166 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid);
161 }; 167 };
162 168
163 } // namespace media_router 169 } // namespace media_router
164 170
165 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ 171 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/app/media_router_strings.grdp ('k') | chrome/browser/media/android/router/media_router_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698