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

Side by Side Diff: content/browser/media/android/media_web_contents_observer_android.h

Issue 1823983002: Remove secondary player from Media Sessions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix accidental formatting changes Created 4 years, 9 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_
6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ 6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/containers/scoped_ptr_hash_map.h" 10 #include "base/containers/scoped_ptr_hash_map.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 // Initiates a synchronous MediaSession request for browser side players. 50 // Initiates a synchronous MediaSession request for browser side players.
51 // 51 //
52 // TODO(dalecurtis): Delete this method once we're no longer using WMPA and 52 // TODO(dalecurtis): Delete this method once we're no longer using WMPA and
53 // the BrowserMediaPlayerManagers. Tracked by http://crbug.com/580626 53 // the BrowserMediaPlayerManagers. Tracked by http://crbug.com/580626
54 bool RequestPlay(RenderFrameHost* render_frame_host, 54 bool RequestPlay(RenderFrameHost* render_frame_host,
55 int delegate_id, 55 int delegate_id,
56 bool has_audio, 56 bool has_audio,
57 bool is_remote, 57 bool is_remote,
58 base::TimeDelta duration); 58 base::TimeDelta duration);
59 59
60 void DisconnectMediaSession(RenderFrameHost* render_frame_host,
61 int delegate_id);
62
60 #if defined(VIDEO_HOLE) 63 #if defined(VIDEO_HOLE)
61 void OnFrameInfoUpdated(); 64 void OnFrameInfoUpdated();
62 #endif // defined(VIDEO_HOLE) 65 #endif // defined(VIDEO_HOLE)
63 66
64 // MediaWebContentsObserver overrides. 67 // MediaWebContentsObserver overrides.
65 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override; 68 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
66 bool OnMessageReceived(const IPC::Message& message, 69 bool OnMessageReceived(const IPC::Message& message,
67 RenderFrameHost* render_frame_host) override; 70 RenderFrameHost* render_frame_host) override;
68 71
69 private: 72 private:
(...skipping 29 matching lines...) Expand all
99 base::ScopedPtrHashMap<RenderFrameHost*, 102 base::ScopedPtrHashMap<RenderFrameHost*,
100 scoped_ptr<BrowserSurfaceViewManager>>; 103 scoped_ptr<BrowserSurfaceViewManager>>;
101 SurfaceViewManagerMap surface_view_managers_; 104 SurfaceViewManagerMap surface_view_managers_;
102 105
103 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); 106 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid);
104 }; 107 };
105 108
106 } // namespace content 109 } // namespace content
107 110
108 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ 111 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698