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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1403 | 1403 |
1404 #if defined(USE_AURA) | 1404 #if defined(USE_AURA) |
1405 | 1405 |
1406 #if defined(USE_X11) | 1406 #if defined(USE_X11) |
1407 if (!gfx::GetXDisplay()) | 1407 if (!gfx::GetXDisplay()) |
1408 return false; | 1408 return false; |
1409 | 1409 |
1410 #if !defined(OS_CHROMEOS) | 1410 #if !defined(OS_CHROMEOS) |
1411 // InitializeToolkit is called before CreateStartupTasks which one starts the | 1411 // InitializeToolkit is called before CreateStartupTasks which one starts the |
1412 // gpu process. | 1412 // gpu process. |
| 1413 Visual* visual = NULL; |
1413 int depth = 0; | 1414 int depth = 0; |
1414 ui::ChooseVisualForWindow(NULL, &depth); | 1415 ui::ChooseVisualForWindow(&visual, &depth); |
1415 DCHECK(depth > 0); | 1416 DCHECK(depth > 0); |
1416 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( | 1417 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
1417 switches::kWindowDepth, base::IntToString(depth)); | 1418 switches::kWindowDepth, base::IntToString(depth)); |
| 1419 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
| 1420 switches::kX11VisualID, base::UintToString(visual->visualid)); |
1418 #endif | 1421 #endif |
1419 | 1422 |
1420 #endif | 1423 #endif |
1421 | 1424 |
1422 // Env creates the compositor. Aura widgets need the compositor to be created | 1425 // Env creates the compositor. Aura widgets need the compositor to be created |
1423 // before they can be initialized by the browser. | 1426 // before they can be initialized by the browser. |
1424 env_ = aura::Env::CreateInstance(); | 1427 env_ = aura::Env::CreateInstance(); |
1425 #endif // defined(USE_AURA) | 1428 #endif // defined(USE_AURA) |
1426 | 1429 |
1427 if (parts_) | 1430 if (parts_) |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1543 std::move(worker_task_runner), | 1546 std::move(worker_task_runner), |
1544 MediaInternals::GetInstance()); | 1547 MediaInternals::GetInstance()); |
1545 } | 1548 } |
1546 CHECK(audio_manager_); | 1549 CHECK(audio_manager_); |
1547 | 1550 |
1548 if (use_hang_monitor) | 1551 if (use_hang_monitor) |
1549 media::AudioManager::StartHangMonitor(io_thread_->task_runner()); | 1552 media::AudioManager::StartHangMonitor(io_thread_->task_runner()); |
1550 } | 1553 } |
1551 | 1554 |
1552 } // namespace content | 1555 } // namespace content |
OLD | NEW |