| 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 1390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1401 | 1401 |
| 1402 #if defined(USE_X11) | 1402 #if defined(USE_X11) |
| 1403 if (!gfx::GetXDisplay()) { | 1403 if (!gfx::GetXDisplay()) { |
| 1404 LOG(ERROR) << "Unable to open X display."; | 1404 LOG(ERROR) << "Unable to open X display."; |
| 1405 return false; | 1405 return false; |
| 1406 } | 1406 } |
| 1407 #endif | 1407 #endif |
| 1408 | 1408 |
| 1409 // Env creates the compositor. Aura widgets need the compositor to be created | 1409 // Env creates the compositor. Aura widgets need the compositor to be created |
| 1410 // before they can be initialized by the browser. | 1410 // before they can be initialized by the browser. |
| 1411 env_ = aura::Env::CreateInstance(); | 1411 env_ = aura::Env::CreateInstance(shell::ShellIsRemote(), UsingInProcessGpu()); |
| 1412 #endif // defined(USE_AURA) | 1412 #endif // defined(USE_AURA) |
| 1413 | 1413 |
| 1414 if (parts_) | 1414 if (parts_) |
| 1415 parts_->ToolkitInitialized(); | 1415 parts_->ToolkitInitialized(); |
| 1416 | 1416 |
| 1417 return true; | 1417 return true; |
| 1418 } | 1418 } |
| 1419 | 1419 |
| 1420 void BrowserMainLoop::MainMessageLoopRun() { | 1420 void BrowserMainLoop::MainMessageLoopRun() { |
| 1421 #if defined(OS_ANDROID) | 1421 #if defined(OS_ANDROID) |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1546 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 1546 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = |
| 1547 audio_thread_->task_runner(); | 1547 audio_thread_->task_runner(); |
| 1548 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 1548 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), |
| 1549 std::move(worker_task_runner), | 1549 std::move(worker_task_runner), |
| 1550 MediaInternals::GetInstance()); | 1550 MediaInternals::GetInstance()); |
| 1551 } | 1551 } |
| 1552 CHECK(audio_manager_); | 1552 CHECK(audio_manager_); |
| 1553 } | 1553 } |
| 1554 | 1554 |
| 1555 } // namespace content | 1555 } // namespace content |
| OLD | NEW |