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

Side by Side Diff: content/browser/media/media_web_contents_observer.cc

Issue 726203002: Fixes unused variable in MediaWebContentsObserver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "content/browser/media/media_web_contents_observer.h" 5 #include "content/browser/media/media_web_contents_observer.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "content/browser/media/cdm/browser_cdm_manager.h" 9 #include "content/browser/media/cdm/browser_cdm_manager.h"
10 #include "content/browser/renderer_host/render_process_host_impl.h" 10 #include "content/browser/renderer_host/render_process_host_impl.h"
(...skipping 12 matching lines...) Expand all
23 MediaWebContentsObserver::MediaWebContentsObserver( 23 MediaWebContentsObserver::MediaWebContentsObserver(
24 RenderViewHost* render_view_host) 24 RenderViewHost* render_view_host)
25 : WebContentsObserver(WebContents::FromRenderViewHost(render_view_host)) { 25 : WebContentsObserver(WebContents::FromRenderViewHost(render_view_host)) {
26 } 26 }
27 27
28 MediaWebContentsObserver::~MediaWebContentsObserver() { 28 MediaWebContentsObserver::~MediaWebContentsObserver() {
29 } 29 }
30 30
31 void MediaWebContentsObserver::RenderFrameDeleted( 31 void MediaWebContentsObserver::RenderFrameDeleted(
32 RenderFrameHost* render_frame_host) { 32 RenderFrameHost* render_frame_host) {
33 #if defined(OS_ANDROID)
33 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); 34 uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
34 // Always destroy the media players before CDMs because we do not support 35 // Always destroy the media players before CDMs because we do not support
35 // detaching CDMs from media players yet. See http://crbug.com/330324 36 // detaching CDMs from media players yet. See http://crbug.com/330324
36 #if defined(OS_ANDROID)
37 media_player_managers_.erase(key); 37 media_player_managers_.erase(key);
38 #endif 38 #endif
39 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager 39 // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager
40 // and BrowserCdmManager all run on browser UI thread. So this call is okay. 40 // and BrowserCdmManager all run on browser UI thread. So this call is okay.
41 // In the future we need to support the case where MediaWebContentsObserver 41 // In the future we need to support the case where MediaWebContentsObserver
42 // get notified on browser UI thread, but BrowserMediaPlayerManager and 42 // get notified on browser UI thread, but BrowserMediaPlayerManager and
43 // BrowserCdmManager run on a different thread. 43 // BrowserCdmManager run on a different thread.
44 BrowserCdmManager* browser_cdm_manager = 44 BrowserCdmManager* browser_cdm_manager =
45 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID()); 45 BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID());
46 if (browser_cdm_manager) 46 if (browser_cdm_manager)
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 iter != media_player_managers_.end(); ++iter) { 172 iter != media_player_managers_.end(); ++iter) {
173 BrowserMediaPlayerManager* manager = iter->second; 173 BrowserMediaPlayerManager* manager = iter->second;
174 manager->OnFrameInfoUpdated(); 174 manager->OnFrameInfoUpdated();
175 } 175 }
176 } 176 }
177 #endif // defined(VIDEO_HOLE) 177 #endif // defined(VIDEO_HOLE)
178 178
179 #endif // defined(OS_ANDROID) 179 #endif // defined(OS_ANDROID)
180 180
181 } // namespace content 181 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698