OLD | NEW |
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 <memory> | 10 #include <memory> |
| 11 #include <unordered_map> |
11 | 12 |
12 #include "base/macros.h" | 13 #include "base/macros.h" |
13 #include "content/browser/media/media_web_contents_observer.h" | 14 #include "content/browser/media/media_web_contents_observer.h" |
14 #include "content/common/content_export.h" | 15 #include "content/common/content_export.h" |
15 | 16 |
16 namespace media { | 17 namespace media { |
17 enum class MediaContentType; | 18 enum class MediaContentType; |
18 } // namespace media | 19 } // namespace media |
19 | 20 |
20 namespace content { | 21 namespace content { |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 // Helper functions to handle media player IPC messages. Returns whether the | 70 // Helper functions to handle media player IPC messages. Returns whether the |
70 // |message| is handled in the function. | 71 // |message| is handled in the function. |
71 bool OnMediaPlayerMessageReceived(const IPC::Message& message, | 72 bool OnMediaPlayerMessageReceived(const IPC::Message& message, |
72 RenderFrameHost* render_frame_host); | 73 RenderFrameHost* render_frame_host); |
73 | 74 |
74 bool OnSurfaceViewManagerMessageReceived(const IPC::Message& message, | 75 bool OnSurfaceViewManagerMessageReceived(const IPC::Message& message, |
75 RenderFrameHost* render_frame_host); | 76 RenderFrameHost* render_frame_host); |
76 | 77 |
77 // Map from RenderFrameHost* to BrowserMediaPlayerManager. | 78 // Map from RenderFrameHost* to BrowserMediaPlayerManager. |
78 using MediaPlayerManagerMap = | 79 using MediaPlayerManagerMap = |
79 base::ScopedPtrHashMap<RenderFrameHost*, | 80 std::unordered_map<RenderFrameHost*, |
80 std::unique_ptr<BrowserMediaPlayerManager>>; | 81 std::unique_ptr<BrowserMediaPlayerManager>>; |
81 MediaPlayerManagerMap media_player_managers_; | 82 MediaPlayerManagerMap media_player_managers_; |
82 | 83 |
83 using SurfaceViewManagerMap = | 84 using SurfaceViewManagerMap = |
84 base::ScopedPtrHashMap<RenderFrameHost*, | 85 std::unordered_map<RenderFrameHost*, |
85 std::unique_ptr<BrowserSurfaceViewManager>>; | 86 std::unique_ptr<BrowserSurfaceViewManager>>; |
86 SurfaceViewManagerMap surface_view_managers_; | 87 SurfaceViewManagerMap surface_view_managers_; |
87 | 88 |
88 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); | 89 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); |
89 }; | 90 }; |
90 | 91 |
91 } // namespace content | 92 } // namespace content |
92 | 93 |
93 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ | 94 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ |
OLD | NEW |