diff options
| author | bdibello@google.com <bdibello@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-10 18:52:56 +0000 |
|---|---|---|
| committer | bdibello@google.com <bdibello@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-10 18:52:56 +0000 |
| commit | 5acb0a7605d1eec9220e0b7b3b663967fcf1e5ce (patch) | |
| tree | 61dba9e1e4081f8d67c46febb499a17e24391290 /content/browser/browser_main_loop.cc | |
| parent | e499e674b043597f1f05ce1bd070241014a884a3 (diff) | |
| download | chromium_src-5acb0a7605d1eec9220e0b7b3b663967fcf1e5ce.zip chromium_src-5acb0a7605d1eec9220e0b7b3b663967fcf1e5ce.tar.gz chromium_src-5acb0a7605d1eec9220e0b7b3b663967fcf1e5ce.tar.bz2 | |
Remove dependencies on /media for iOS.
/media was only needed for the old version of voice search on iOS.
BUG=227855
Review URL: https://chromiumcodereview.appspot.com/18777006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 5f99db5..67c32f2 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -402,6 +402,7 @@ void BrowserMainLoop::MainMessageLoopStart() { network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); } +#if !defined(OS_IOS) { TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures") media::InitializeCPUSpecificMediaFeatures(); @@ -414,8 +415,6 @@ void BrowserMainLoop::MainMessageLoopStart() { TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager") midi_manager_.reset(media::MIDIManager::Create()); } - -#if !defined(OS_IOS) { TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") WebUIControllerFactory::RegisterFactory( |