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

Unified Diff: content/browser/browser_main_loop.h

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 138d11e1b1e4f0c55945e29ba1d655482bbe859c..f43e6eb0fd614d5de3288f6a9b206e33fd289ebd 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -14,7 +14,6 @@
#include "ui/base/win/scoped_ole_initializer.h"
#endif
-class AudioManager;
class BrowserOnlineStateObserver;
class CommandLine;
class HighResolutionTimerManager;
@@ -25,6 +24,10 @@ namespace base {
class SystemMonitor;
}
+namespace media {
+class AudioManager;
+}
+
namespace net {
class NetworkChangeNotifier;
}
@@ -66,7 +69,7 @@ class BrowserMainLoop {
int GetResultCode() const { return result_code_; }
// Can be called on any thread.
- static AudioManager* GetAudioManager();
+ static media::AudioManager* GetAudioManager();
private:
// For ShutdownThreadsAndCleanUp.
@@ -89,7 +92,7 @@ class BrowserMainLoop {
scoped_ptr<base::SystemMonitor> system_monitor_;
scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_;
scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
- scoped_ptr<AudioManager> audio_manager_;
+ scoped_ptr<media::AudioManager> audio_manager_;
// Per-process listener for online state changes.
scoped_ptr<BrowserOnlineStateObserver> online_state_observer_;
#if defined(OS_WIN)
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698