| 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 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1070 established_gpu_channel = always_uses_gpu = false; | 1070 established_gpu_channel = always_uses_gpu = false; |
| 1071 } | 1071 } |
| 1072 BrowserGpuChannelHostFactory::Initialize(established_gpu_channel); | 1072 BrowserGpuChannelHostFactory::Initialize(established_gpu_channel); |
| 1073 ImageTransportFactory::Initialize(); | 1073 ImageTransportFactory::Initialize(); |
| 1074 #if defined(USE_AURA) | 1074 #if defined(USE_AURA) |
| 1075 if (aura::Env::GetInstance()) { | 1075 if (aura::Env::GetInstance()) { |
| 1076 aura::Env::GetInstance()->set_context_factory(GetContextFactory()); | 1076 aura::Env::GetInstance()->set_context_factory(GetContextFactory()); |
| 1077 } | 1077 } |
| 1078 #endif | 1078 #endif |
| 1079 #elif defined(OS_ANDROID) | 1079 #elif defined(OS_ANDROID) |
| 1080 // TODO(crbug.com/439322): This should be set to |true|. | 1080 established_gpu_channel = true; |
| 1081 established_gpu_channel = false; | |
| 1082 BrowserGpuChannelHostFactory::Initialize(established_gpu_channel); | 1081 BrowserGpuChannelHostFactory::Initialize(established_gpu_channel); |
| 1083 #endif | 1082 #endif |
| 1084 | 1083 |
| 1085 #if defined(OS_LINUX) && defined(USE_UDEV) | 1084 #if defined(OS_LINUX) && defined(USE_UDEV) |
| 1086 device_monitor_linux_.reset(new DeviceMonitorLinux()); | 1085 device_monitor_linux_.reset(new DeviceMonitorLinux()); |
| 1087 #elif defined(OS_MACOSX) | 1086 #elif defined(OS_MACOSX) |
| 1088 device_monitor_mac_.reset(new DeviceMonitorMac()); | 1087 device_monitor_mac_.reset(new DeviceMonitorMac()); |
| 1089 #endif | 1088 #endif |
| 1090 | 1089 |
| 1091 #if defined(OS_WIN) | 1090 #if defined(OS_WIN) |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1271 | 1270 |
| 1272 void BrowserMainLoop::EndStartupTracing() { | 1271 void BrowserMainLoop::EndStartupTracing() { |
| 1273 is_tracing_startup_ = false; | 1272 is_tracing_startup_ = false; |
| 1274 TracingController::GetInstance()->DisableRecording( | 1273 TracingController::GetInstance()->DisableRecording( |
| 1275 TracingController::CreateFileSink( | 1274 TracingController::CreateFileSink( |
| 1276 startup_trace_file_, | 1275 startup_trace_file_, |
| 1277 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1276 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
| 1278 } | 1277 } |
| 1279 | 1278 |
| 1280 } // namespace content | 1279 } // namespace content |
| OLD | NEW |