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

Side by Side Diff: content/renderer/media/android/webmediasession_android.h

Issue 1441883003: Hook up RendererMediaSessionManager with browser side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comment from philipj: ActiveDOMObject 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 CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIASESSION_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIASESSION_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIASESSION_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIASESSION_ANDROID_H_
7 7
8 #include "base/id_map.h"
8 #include "base/macros.h" 9 #include "base/macros.h"
9 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
10 #include "third_party/WebKit/public/platform/modules/mediasession/WebMediaSessio n.h" 11 #include "third_party/WebKit/public/platform/modules/mediasession/WebMediaSessio n.h"
11 12
12 namespace content { 13 namespace content {
13 14
14 class RendererMediaSessionManager; 15 class RendererMediaSessionManager;
15 16
16 class CONTENT_EXPORT WebMediaSessionAndroid : public blink::WebMediaSession { 17 class CONTENT_EXPORT WebMediaSessionAndroid : public blink::WebMediaSession {
17 public: 18 public:
18 WebMediaSessionAndroid(RendererMediaSessionManager* session_manager); 19 WebMediaSessionAndroid(RendererMediaSessionManager* session_manager);
19 virtual ~WebMediaSessionAndroid() override; 20 virtual ~WebMediaSessionAndroid() override;
20 21
21 void activate(blink::WebMediaSessionActivateCallback*) override; 22 void activate(blink::WebMediaSessionActivateCallback*) override;
22 void deactivate(blink::WebMediaSessionDeactivateCallback*) override; 23 void deactivate(blink::WebMediaSessionDeactivateCallback*) override;
23 24
25 bool hasPendingCallbacks() override;
26
27 void OnDidActivate(int request_id, bool success);
28 void OnDidDeactivate(int request_id);
29
30 int session_id() const { return session_id_; }
31
24 private: 32 private:
25 RendererMediaSessionManager* const session_manager_; 33 RendererMediaSessionManager* const session_manager_;
26 int session_id_; 34 int session_id_;
35 int next_request_id_;
mlamouri (slow - plz ping) 2015/12/07 18:14:53 I don't think you need next_request_id_.
davve 2015/12/08 10:21:23 Done.
36
37 using ActivationRequests =
38 IDMap<blink::WebMediaSessionActivateCallback, IDMapOwnPointer>;
39 ActivationRequests activation_requests_;
40
41 using DeactivationRequests =
42 IDMap<blink::WebMediaSessionDeactivateCallback, IDMapOwnPointer>;
43 DeactivationRequests deactivation_requests_;
27 44
28 DISALLOW_COPY_AND_ASSIGN(WebMediaSessionAndroid); 45 DISALLOW_COPY_AND_ASSIGN(WebMediaSessionAndroid);
29 }; 46 };
30 47
31 } // namespace content 48 } // namespace content
32 49
33 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIASESSION_ANDROID_H_ 50 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIASESSION_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698