OLD | NEW |
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/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/memory_pressure_monitor.h" | 10 #include "base/memory/memory_pressure_monitor.h" |
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
552 hi_res_timer_manager_.reset(new base::HighResolutionTimerManager); | 552 hi_res_timer_manager_.reset(new base::HighResolutionTimerManager); |
553 } | 553 } |
554 { | 554 { |
555 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:NetworkChangeNotifier"); | 555 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:NetworkChangeNotifier"); |
556 network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); | 556 network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); |
557 } | 557 } |
558 | 558 |
559 #if !defined(OS_IOS) | 559 #if !defined(OS_IOS) |
560 { | 560 { |
561 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures"); | 561 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures"); |
562 media::InitializeCPUSpecificMediaFeatures(); | 562 media::InitializeMediaLibrary(); |
563 } | 563 } |
564 { | 564 { |
565 TRACE_EVENT0("startup", | 565 TRACE_EVENT0("startup", |
566 "BrowserMainLoop::Subsystem:ContentWebUIController"); | 566 "BrowserMainLoop::Subsystem:ContentWebUIController"); |
567 WebUIControllerFactory::RegisterFactory( | 567 WebUIControllerFactory::RegisterFactory( |
568 ContentWebUIControllerFactory::GetInstance()); | 568 ContentWebUIControllerFactory::GetInstance()); |
569 } | 569 } |
570 | 570 |
571 { | 571 { |
572 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:OnlineStateObserver"); | 572 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:OnlineStateObserver"); |
(...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1365 | 1365 |
1366 void BrowserMainLoop::EndStartupTracing() { | 1366 void BrowserMainLoop::EndStartupTracing() { |
1367 is_tracing_startup_ = false; | 1367 is_tracing_startup_ = false; |
1368 TracingController::GetInstance()->DisableRecording( | 1368 TracingController::GetInstance()->DisableRecording( |
1369 TracingController::CreateFileSink( | 1369 TracingController::CreateFileSink( |
1370 startup_trace_file_, | 1370 startup_trace_file_, |
1371 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1371 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
1372 } | 1372 } |
1373 | 1373 |
1374 } // namespace content | 1374 } // namespace content |
OLD | NEW |