| 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/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1082 BrowserGpuChannelHostFactory::Initialize(established_gpu_channel); | 1082 BrowserGpuChannelHostFactory::Initialize(established_gpu_channel); |
| 1083 #endif | 1083 #endif |
| 1084 | 1084 |
| 1085 #if defined(OS_LINUX) && defined(USE_UDEV) | 1085 #if defined(OS_LINUX) && defined(USE_UDEV) |
| 1086 device_monitor_linux_.reset(new DeviceMonitorLinux()); | 1086 device_monitor_linux_.reset(new DeviceMonitorLinux()); |
| 1087 #elif defined(OS_MACOSX) | 1087 #elif defined(OS_MACOSX) |
| 1088 device_monitor_mac_.reset(new DeviceMonitorMac()); | 1088 device_monitor_mac_.reset(new DeviceMonitorMac()); |
| 1089 #endif | 1089 #endif |
| 1090 | 1090 |
| 1091 #if defined(OS_WIN) | 1091 #if defined(OS_WIN) |
| 1092 LOCAL_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown", | 1092 UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown", |
| 1093 IsWin32kRendererLockdownEnabled()); | 1093 IsWin32kRendererLockdownEnabled()); |
| 1094 #endif | 1094 #endif |
| 1095 // RDH needs the IO thread to be created | 1095 // RDH needs the IO thread to be created |
| 1096 { | 1096 { |
| 1097 TRACE_EVENT0("startup", | 1097 TRACE_EVENT0("startup", |
| 1098 "BrowserMainLoop::BrowserThreadsStarted:InitResourceDispatcherHost"); | 1098 "BrowserMainLoop::BrowserThreadsStarted:InitResourceDispatcherHost"); |
| 1099 resource_dispatcher_host_.reset(new ResourceDispatcherHostImpl()); | 1099 resource_dispatcher_host_.reset(new ResourceDispatcherHostImpl()); |
| 1100 } | 1100 } |
| 1101 | 1101 |
| 1102 // MediaStreamManager needs the IO thread to be created. | 1102 // MediaStreamManager needs the IO thread to be created. |
| 1103 { | 1103 { |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1271 | 1271 |
| 1272 void BrowserMainLoop::EndStartupTracing() { | 1272 void BrowserMainLoop::EndStartupTracing() { |
| 1273 is_tracing_startup_ = false; | 1273 is_tracing_startup_ = false; |
| 1274 TracingController::GetInstance()->DisableRecording( | 1274 TracingController::GetInstance()->DisableRecording( |
| 1275 TracingController::CreateFileSink( | 1275 TracingController::CreateFileSink( |
| 1276 startup_trace_file_, | 1276 startup_trace_file_, |
| 1277 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1277 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
| 1278 } | 1278 } |
| 1279 | 1279 |
| 1280 } // namespace content | 1280 } // namespace content |
| OLD | NEW |