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

Side by Side Diff: chrome/browser/media/android/router/media_router_android.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
« 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 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 22 matching lines...) Expand all
33 const MediaSink::Id& sink_id, 33 const MediaSink::Id& sink_id,
34 const GURL& origin, 34 const GURL& origin,
35 content::WebContents* web_contents, 35 content::WebContents* web_contents,
36 const std::vector<MediaRouteResponseCallback>& callbacks) override; 36 const std::vector<MediaRouteResponseCallback>& callbacks) override;
37 void JoinRoute( 37 void JoinRoute(
38 const MediaSource::Id& source, 38 const MediaSource::Id& source,
39 const std::string& presentation_id, 39 const std::string& presentation_id,
40 const GURL& origin, 40 const GURL& origin,
41 content::WebContents* web_contents, 41 content::WebContents* web_contents,
42 const std::vector<MediaRouteResponseCallback>& callbacks) override; 42 const std::vector<MediaRouteResponseCallback>& callbacks) override;
43 void CloseRoute(const MediaRoute::Id& route_id) override; 43 void DetachRoute(const MediaRoute::Id& route_id) override;
44 void TerminateRoute(const MediaRoute::Id& route_id) override;
44 void SendRouteMessage(const MediaRoute::Id& route_id, 45 void SendRouteMessage(const MediaRoute::Id& route_id,
45 const std::string& message, 46 const std::string& message,
46 const SendRouteMessageCallback& callback) override; 47 const SendRouteMessageCallback& callback) override;
47 void SendRouteBinaryMessage( 48 void SendRouteBinaryMessage(
48 const MediaRoute::Id& route_id, 49 const MediaRoute::Id& route_id,
49 scoped_ptr<std::vector<uint8>> data, 50 scoped_ptr<std::vector<uint8>> data,
50 const SendRouteMessageCallback& callback) override; 51 const SendRouteMessageCallback& callback) override;
51 void AddIssue(const Issue& issue) override; 52 void AddIssue(const Issue& issue) override;
52 void ClearIssue(const Issue::Id& issue_id) override; 53 void ClearIssue(const Issue::Id& issue_id) override;
53 void OnPresentationSessionDetached(const MediaRoute::Id& route_id) override;
54 bool HasLocalDisplayRoute() const override; 54 bool HasLocalDisplayRoute() const override;
55 55
56 // The methods called by the Java counterpart. 56 // The methods called by the Java counterpart.
57 57
58 // Notifies the media router that information about sinks is received for 58 // Notifies the media router that information about sinks is received for
59 // a specific source URN. 59 // a specific source URN.
60 void OnSinksReceived( 60 void OnSinksReceived(
61 JNIEnv* env, jobject obj, jstring jsource_urn, jint jcount); 61 JNIEnv* env, jobject obj, jstring jsource_urn, jint jcount);
62 62
63 // Notifies the media router about a successful route creation. 63 // Notifies the media router about a successful route creation.
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 MediaRoute::Id, 143 MediaRoute::Id,
144 scoped_ptr<base::ObserverList<PresentationSessionMessagesObserver>>>; 144 scoped_ptr<base::ObserverList<PresentationSessionMessagesObserver>>>;
145 MessagesObservers messages_observers_; 145 MessagesObservers messages_observers_;
146 146
147 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid); 147 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid);
148 }; 148 };
149 149
150 } // namespace media_router 150 } // namespace media_router
151 151
152 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ 152 #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