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

Side by Side Diff: content/browser/renderer_host/media/audio_renderer_host.cc

Issue 9371025: Move resource_context.h to content/public/browser. Remove the workaround in its destructor since ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer_host/media/audio_renderer_host.h" 5 #include "content/browser/renderer_host/media/audio_renderer_host.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/process.h" 9 #include "base/process.h"
10 #include "base/shared_memory.h" 10 #include "base/shared_memory.h"
11 #include "content/browser/renderer_host/media/audio_common.h" 11 #include "content/browser/renderer_host/media/audio_common.h"
12 #include "content/browser/renderer_host/media/audio_sync_reader.h" 12 #include "content/browser/renderer_host/media/audio_sync_reader.h"
13 #include "content/browser/renderer_host/media/media_observer.h" 13 #include "content/browser/renderer_host/media/media_observer.h"
14 #include "content/browser/resource_context.h"
15 #include "content/common/media/audio_messages.h" 14 #include "content/common/media/audio_messages.h"
15 #include "content/public/browser/resource_context.h"
16 #include "media/audio/audio_util.h" 16 #include "media/audio/audio_util.h"
17 #include "ipc/ipc_logging.h"
18 17
19 using content::BrowserMessageFilter; 18 using content::BrowserMessageFilter;
20 using content::BrowserThread; 19 using content::BrowserThread;
21 20
22 AudioRendererHost::AudioEntry::AudioEntry() 21 AudioRendererHost::AudioEntry::AudioEntry()
23 : stream_id(0), 22 : stream_id(0),
24 pending_close(false) { 23 pending_close(false) {
25 } 24 }
26 25
27 AudioRendererHost::AudioEntry::~AudioEntry() {} 26 AudioRendererHost::AudioEntry::~AudioEntry() {}
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 } 386 }
388 return NULL; 387 return NULL;
389 } 388 }
390 389
391 MediaObserver* AudioRendererHost::media_observer() { 390 MediaObserver* AudioRendererHost::media_observer() {
392 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 391 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
393 if (!media_observer_) 392 if (!media_observer_)
394 media_observer_ = resource_context_->GetMediaObserver(); 393 media_observer_ = resource_context_->GetMediaObserver();
395 return media_observer_; 394 return media_observer_;
396 } 395 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698