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/feature_list.h" | 9 #include "base/feature_list.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 | 155 |
156 #if defined(ENABLE_PLUGINS) | 156 #if defined(ENABLE_PLUGINS) |
157 #include "content/browser/plugin_service_impl.h" | 157 #include "content/browser/plugin_service_impl.h" |
158 #endif | 158 #endif |
159 | 159 |
160 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) | 160 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) |
161 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" | 161 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" |
162 #endif | 162 #endif |
163 | 163 |
164 #if defined(USE_X11) | 164 #if defined(USE_X11) |
| 165 #include "ui/base/x/x11_util_internal.h" |
165 #include "ui/gfx/x/x11_connection.h" | 166 #include "ui/gfx/x/x11_connection.h" |
| 167 #include "ui/gfx/x/x11_switches.h" |
166 #include "ui/gfx/x/x11_types.h" | 168 #include "ui/gfx/x/x11_types.h" |
167 #endif | 169 #endif |
168 | 170 |
169 #if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL) | 171 #if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL) |
170 #include "crypto/nss_util.h" | 172 #include "crypto/nss_util.h" |
171 #endif | 173 #endif |
172 | 174 |
173 #if defined(MOJO_SHELL_CLIENT) | 175 #if defined(MOJO_SHELL_CLIENT) |
174 #include "components/mus/public/interfaces/window_manager.mojom.h" | 176 #include "components/mus/public/interfaces/window_manager.mojom.h" |
175 #include "content/common/mojo/mojo_shell_connection_impl.h" | 177 #include "content/common/mojo/mojo_shell_connection_impl.h" |
(...skipping 1174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1350 config.dwICC = ICC_WIN95_CLASSES; | 1352 config.dwICC = ICC_WIN95_CLASSES; |
1351 if (!InitCommonControlsEx(&config)) | 1353 if (!InitCommonControlsEx(&config)) |
1352 PLOG(FATAL); | 1354 PLOG(FATAL); |
1353 #endif | 1355 #endif |
1354 | 1356 |
1355 #if defined(USE_AURA) | 1357 #if defined(USE_AURA) |
1356 | 1358 |
1357 #if defined(USE_X11) | 1359 #if defined(USE_X11) |
1358 if (!gfx::GetXDisplay()) | 1360 if (!gfx::GetXDisplay()) |
1359 return false; | 1361 return false; |
| 1362 |
| 1363 #if !defined(OS_CHROMEOS) |
| 1364 // InitializeToolkit is called before CreateStartupTasks which one starts the |
| 1365 // gpu process. |
| 1366 int depth = 0; |
| 1367 ui::ChooseARGBVisualForWindow(NULL, &depth); |
| 1368 DCHECK(depth > 0); |
| 1369 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
| 1370 switches::kWindowDepth, base::IntToString(depth)); |
| 1371 #endif |
| 1372 |
1360 #endif | 1373 #endif |
1361 | 1374 |
1362 // Env creates the compositor. Aura widgets need the compositor to be created | 1375 // Env creates the compositor. Aura widgets need the compositor to be created |
1363 // before they can be initialized by the browser. | 1376 // before they can be initialized by the browser. |
1364 aura::Env::CreateInstance(true); | 1377 aura::Env::CreateInstance(true); |
1365 #endif // defined(USE_AURA) | 1378 #endif // defined(USE_AURA) |
1366 | 1379 |
1367 if (parts_) | 1380 if (parts_) |
1368 parts_->ToolkitInitialized(); | 1381 parts_->ToolkitInitialized(); |
1369 | 1382 |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1449 DCHECK(is_tracing_startup_for_duration_); | 1462 DCHECK(is_tracing_startup_for_duration_); |
1450 | 1463 |
1451 is_tracing_startup_for_duration_ = false; | 1464 is_tracing_startup_for_duration_ = false; |
1452 TracingController::GetInstance()->StopTracing( | 1465 TracingController::GetInstance()->StopTracing( |
1453 TracingController::CreateFileSink( | 1466 TracingController::CreateFileSink( |
1454 startup_trace_file_, | 1467 startup_trace_file_, |
1455 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1468 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
1456 } | 1469 } |
1457 | 1470 |
1458 } // namespace content | 1471 } // namespace content |
OLD | NEW |