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

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

Issue 1550593002: Switch to standard integer types in chrome/browser/, part 2 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 10
10 #include "base/android/scoped_java_ref.h" 11 #include "base/android/scoped_java_ref.h"
11 #include "base/containers/scoped_ptr_hash_map.h" 12 #include "base/containers/scoped_ptr_hash_map.h"
12 #include "base/id_map.h" 13 #include "base/id_map.h"
14 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
14 #include "base/observer_list.h" 16 #include "base/observer_list.h"
15 #include "chrome/browser/media/router/media_router_base.h" 17 #include "chrome/browser/media/router/media_router_base.h"
16 18
17 namespace content { 19 namespace content {
18 class BrowserContext; 20 class BrowserContext;
19 } 21 }
20 22
21 namespace media_router { 23 namespace media_router {
22 24
(...skipping 19 matching lines...) Expand all
42 const GURL& origin, 44 const GURL& origin,
43 content::WebContents* web_contents, 45 content::WebContents* web_contents,
44 const std::vector<MediaRouteResponseCallback>& callbacks) override; 46 const std::vector<MediaRouteResponseCallback>& callbacks) override;
45 void DetachRoute(const MediaRoute::Id& route_id) override; 47 void DetachRoute(const MediaRoute::Id& route_id) override;
46 void TerminateRoute(const MediaRoute::Id& route_id) override; 48 void TerminateRoute(const MediaRoute::Id& route_id) override;
47 void SendRouteMessage(const MediaRoute::Id& route_id, 49 void SendRouteMessage(const MediaRoute::Id& route_id,
48 const std::string& message, 50 const std::string& message,
49 const SendRouteMessageCallback& callback) override; 51 const SendRouteMessageCallback& callback) override;
50 void SendRouteBinaryMessage( 52 void SendRouteBinaryMessage(
51 const MediaRoute::Id& route_id, 53 const MediaRoute::Id& route_id,
52 scoped_ptr<std::vector<uint8>> data, 54 scoped_ptr<std::vector<uint8_t>> data,
53 const SendRouteMessageCallback& callback) override; 55 const SendRouteMessageCallback& callback) override;
54 void AddIssue(const Issue& issue) override; 56 void AddIssue(const Issue& issue) override;
55 void ClearIssue(const Issue::Id& issue_id) override; 57 void ClearIssue(const Issue::Id& issue_id) override;
56 bool HasLocalDisplayRoute() const override; 58 bool HasLocalDisplayRoute() const override;
57 59
58 // The methods called by the Java counterpart. 60 // The methods called by the Java counterpart.
59 61
60 // Notifies the media router that information about sinks is received for 62 // Notifies the media router that information about sinks is received for
61 // a specific source URN. 63 // a specific source URN.
62 void OnSinksReceived(JNIEnv* env, 64 void OnSinksReceived(JNIEnv* env,
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 MediaRoute::Id, 156 MediaRoute::Id,
155 scoped_ptr<base::ObserverList<PresentationSessionMessagesObserver>>>; 157 scoped_ptr<base::ObserverList<PresentationSessionMessagesObserver>>>;
156 MessagesObservers messages_observers_; 158 MessagesObservers messages_observers_;
157 159
158 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid); 160 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid);
159 }; 161 };
160 162
161 } // namespace media_router 163 } // namespace media_router
162 164
163 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ 165 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698