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

Side by Side Diff: content/browser/media/session/media_session_impl.h

Issue 2715723002: Fix a crash in MediaSessionServiceImpl due to life time issue (Closed)
Patch Set: addressed avayvod@'s comments Created 3 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 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_BROWSER_MEDIA_SESSION_MEDIA_SESSION_IMPL_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_IMPL_H_
6 #define CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_IMPL_H_ 6 #define CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 CONTENT_EXPORT AudioFocusManager::AudioFocusType audio_focus_type() const { 160 CONTENT_EXPORT AudioFocusManager::AudioFocusType audio_focus_type() const {
161 return audio_focus_type_; 161 return audio_focus_type_;
162 } 162 }
163 163
164 // Returns whether the session has Pepper instances. 164 // Returns whether the session has Pepper instances.
165 bool HasPepper() const; 165 bool HasPepper() const;
166 166
167 // WebContentsObserver implementation 167 // WebContentsObserver implementation
168 void WebContentsDestroyed() override; 168 void WebContentsDestroyed() override;
169 169
170 void RenderFrameDeleted(RenderFrameHost* rfh) override;
Charlie Reis 2017/02/23 20:36:41 nit: The convention is to have no blank line befor
Zhiqiang Zhang (Slow) 2017/02/23 21:04:05 Done.
171
170 // MediaSessionService-related methods 172 // MediaSessionService-related methods
171 173
172 // Called when a MediaSessionService is created, which registers itself to 174 // Called when a MediaSessionService is created, which registers itself to
173 // this session. 175 // this session.
174 void OnServiceCreated(MediaSessionServiceImpl* service); 176 void OnServiceCreated(MediaSessionServiceImpl* service);
175 // Called when a MediaSessionService is destroyed, which unregisters itself 177 // Called when a MediaSessionService is destroyed, which unregisters itself
176 // from this session. 178 // from this session.
177 void OnServiceDestroyed(MediaSessionServiceImpl* service); 179 void OnServiceDestroyed(MediaSessionServiceImpl* service);
178 180
179 // Called when the playback state of a MediaSessionService has 181 // Called when the playback state of a MediaSessionService has
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 ServicesMap services_; 313 ServicesMap services_;
312 // The currently routed service (non-owned pointer). 314 // The currently routed service (non-owned pointer).
313 MediaSessionServiceImpl* routed_service_; 315 MediaSessionServiceImpl* routed_service_;
314 316
315 DISALLOW_COPY_AND_ASSIGN(MediaSessionImpl); 317 DISALLOW_COPY_AND_ASSIGN(MediaSessionImpl);
316 }; 318 };
317 319
318 } // namespace content 320 } // namespace content
319 321
320 #endif // CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_IMPL_H_ 322 #endif // CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698