diff options
| author | bdibello@google.com <bdibello@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-28 00:24:32 +0000 |
|---|---|---|
| committer | bdibello@google.com <bdibello@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-28 00:24:32 +0000 |
| commit | f13401b47abd9ac3dc7b11cb5a9775d2da460cb5 (patch) | |
| tree | a9801bfd0e1fc742fbd068c123370e6e75fbf6fa /content/browser/browser_main_loop.cc | |
| parent | 9579cbcdc6bc794f5ea472f6111f173c2fe93365 (diff) | |
| download | chromium_src-f13401b47abd9ac3dc7b11cb5a9775d2da460cb5.zip chromium_src-f13401b47abd9ac3dc7b11cb5a9775d2da460cb5.tar.gz chromium_src-f13401b47abd9ac3dc7b11cb5a9775d2da460cb5.tar.bz2 | |
Revert "Revert "Remove dependencies on /media for iOS.""
This reverts commit 1f99bc28b47392ed97d03863460bc681d7f39a1a.
/media was only needed for the old version of voice search on iOS.
BUG=227855
Review URL: https://chromiumcodereview.appspot.com/18873009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219867 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 87bec3d..ee84e7c 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -420,6 +420,7 @@ void BrowserMainLoop::MainMessageLoopStart() { network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); } +#if !defined(OS_IOS) { TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures") media::InitializeCPUSpecificMediaFeatures(); @@ -432,8 +433,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( |