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

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

Issue 18777006: Remove dependencies on /media for iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
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
« 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 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 } 395 }
396 { 396 {
397 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:HighResTimerManager") 397 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:HighResTimerManager")
398 hi_res_timer_manager_.reset(new base::HighResolutionTimerManager); 398 hi_res_timer_manager_.reset(new base::HighResolutionTimerManager);
399 } 399 }
400 { 400 {
401 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:NetworkChangeNotifier") 401 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:NetworkChangeNotifier")
402 network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); 402 network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
403 } 403 }
404 404
405 #if !defined(OS_IOS)
405 { 406 {
406 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures") 407 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures")
407 media::InitializeCPUSpecificMediaFeatures(); 408 media::InitializeCPUSpecificMediaFeatures();
408 } 409 }
409 { 410 {
410 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan") 411 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan")
411 audio_manager_.reset(media::AudioManager::Create()); 412 audio_manager_.reset(media::AudioManager::Create());
412 } 413 }
413 { 414 {
414 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager") 415 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager")
415 midi_manager_.reset(media::MIDIManager::Create()); 416 midi_manager_.reset(media::MIDIManager::Create());
416 } 417 }
417
418 #if !defined(OS_IOS)
419 { 418 {
420 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") 419 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController")
421 WebUIControllerFactory::RegisterFactory( 420 WebUIControllerFactory::RegisterFactory(
422 ContentWebUIControllerFactory::GetInstance()); 421 ContentWebUIControllerFactory::GetInstance());
423 } 422 }
424 423
425 { 424 {
426 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMirroringManager") 425 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMirroringManager")
427 audio_mirroring_manager_.reset(new AudioMirroringManager()); 426 audio_mirroring_manager_.reset(new AudioMirroringManager());
428 } 427 }
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
931 if (parameters_.ui_task) 930 if (parameters_.ui_task)
932 base::MessageLoopForUI::current()->PostTask(FROM_HERE, 931 base::MessageLoopForUI::current()->PostTask(FROM_HERE,
933 *parameters_.ui_task); 932 *parameters_.ui_task);
934 933
935 base::RunLoop run_loop; 934 base::RunLoop run_loop;
936 run_loop.Run(); 935 run_loop.Run();
937 #endif 936 #endif
938 } 937 }
939 938
940 } // namespace content 939 } // 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