| 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 1281 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1292 | 1292 | 
| 1293 #if defined(OS_WIN) | 1293 #if defined(OS_WIN) | 
| 1294   system_message_window_.reset(new media::SystemMessageWindowWin); | 1294   system_message_window_.reset(new media::SystemMessageWindowWin); | 
| 1295 #elif defined(OS_LINUX) && defined(USE_UDEV) | 1295 #elif defined(OS_LINUX) && defined(USE_UDEV) | 
| 1296   device_monitor_linux_.reset( | 1296   device_monitor_linux_.reset( | 
| 1297       new media::DeviceMonitorLinux(io_thread_->task_runner())); | 1297       new media::DeviceMonitorLinux(io_thread_->task_runner())); | 
| 1298 #elif defined(OS_MACOSX) | 1298 #elif defined(OS_MACOSX) | 
| 1299   device_monitor_mac_.reset(new media::DeviceMonitorMac()); | 1299   device_monitor_mac_.reset(new media::DeviceMonitorMac()); | 
| 1300 #endif | 1300 #endif | 
| 1301 | 1301 | 
| 1302 #if defined(OS_WIN) |  | 
| 1303   UMA_HISTOGRAM_BOOLEAN("Windows.Win32kRendererLockdown", |  | 
| 1304                         IsWin32kRendererLockdownEnabled()); |  | 
| 1305 #endif |  | 
| 1306 |  | 
| 1307   // RDH needs the IO thread to be created | 1302   // RDH needs the IO thread to be created | 
| 1308   { | 1303   { | 
| 1309     TRACE_EVENT0("startup", | 1304     TRACE_EVENT0("startup", | 
| 1310       "BrowserMainLoop::BrowserThreadsStarted:InitResourceDispatcherHost"); | 1305       "BrowserMainLoop::BrowserThreadsStarted:InitResourceDispatcherHost"); | 
| 1311     // TODO(ananta) | 1306     // TODO(ananta) | 
| 1312     // We register an interceptor on the ResourceDispatcherHostImpl instance to | 1307     // We register an interceptor on the ResourceDispatcherHostImpl instance to | 
| 1313     // intercept requests to create handlers for download requests. We need to | 1308     // intercept requests to create handlers for download requests. We need to | 
| 1314     // find a better way to achieve this. Ideally we don't want knowledge of | 1309     // find a better way to achieve this. Ideally we don't want knowledge of | 
| 1315     // downloads in ResourceDispatcherHostImpl. | 1310     // downloads in ResourceDispatcherHostImpl. | 
| 1316     resource_dispatcher_host_.reset(new ResourceDispatcherHostImpl( | 1311     resource_dispatcher_host_.reset(new ResourceDispatcherHostImpl( | 
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1570     scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 1565     scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 
| 1571         audio_thread_->task_runner(); | 1566         audio_thread_->task_runner(); | 
| 1572     audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 1567     audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 
| 1573                                                  std::move(worker_task_runner), | 1568                                                  std::move(worker_task_runner), | 
| 1574                                                  MediaInternals::GetInstance()); | 1569                                                  MediaInternals::GetInstance()); | 
| 1575   } | 1570   } | 
| 1576   CHECK(audio_manager_); | 1571   CHECK(audio_manager_); | 
| 1577 } | 1572 } | 
| 1578 | 1573 | 
| 1579 }  // namespace content | 1574 }  // namespace content | 
| OLD | NEW | 
|---|