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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 19002008: Revert "Remove dependencies on /media for iOS." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | content/content_common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 } 396 }
397 { 397 {
398 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:HighResTimerManager") 398 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:HighResTimerManager")
399 hi_res_timer_manager_.reset(new base::HighResolutionTimerManager); 399 hi_res_timer_manager_.reset(new base::HighResolutionTimerManager);
400 } 400 }
401 { 401 {
402 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:NetworkChangeNotifier") 402 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:NetworkChangeNotifier")
403 network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); 403 network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
404 } 404 }
405 405
406 #if !defined(OS_IOS)
407 { 406 {
408 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures") 407 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures")
409 media::InitializeCPUSpecificMediaFeatures(); 408 media::InitializeCPUSpecificMediaFeatures();
410 } 409 }
411 { 410 {
412 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan") 411 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan")
413 audio_manager_.reset(media::AudioManager::Create()); 412 audio_manager_.reset(media::AudioManager::Create());
414 } 413 }
415 { 414 {
416 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager") 415 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager")
417 midi_manager_.reset(media::MIDIManager::Create()); 416 midi_manager_.reset(media::MIDIManager::Create());
418 } 417 }
418
419 #if !defined(OS_IOS)
419 { 420 {
420 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") 421 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController")
421 WebUIControllerFactory::RegisterFactory( 422 WebUIControllerFactory::RegisterFactory(
422 ContentWebUIControllerFactory::GetInstance()); 423 ContentWebUIControllerFactory::GetInstance());
423 } 424 }
424 425
425 { 426 {
426 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMirroringManager") 427 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMirroringManager")
427 audio_mirroring_manager_.reset(new AudioMirroringManager()); 428 audio_mirroring_manager_.reset(new AudioMirroringManager());
428 } 429 }
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 if (parameters_.ui_task) 933 if (parameters_.ui_task)
933 base::MessageLoopForUI::current()->PostTask(FROM_HERE, 934 base::MessageLoopForUI::current()->PostTask(FROM_HERE,
934 *parameters_.ui_task); 935 *parameters_.ui_task);
935 936
936 base::RunLoop run_loop; 937 base::RunLoop run_loop;
937 run_loop.Run(); 938 run_loop.Run();
938 #endif 939 #endif
939 } 940 }
940 941
941 } // namespace content 942 } // namespace content
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698