Chromium Code Reviews| 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 "media/audio/audio_manager.h" | 5 #include "media/audio/audio_manager.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 246 bool hang_detection_enabled_ = true; | 246 bool hang_detection_enabled_ = true; |
| 247 base::TimeTicks last_audio_thread_timer_tick_; | 247 base::TimeTicks last_audio_thread_timer_tick_; |
| 248 uint32_t failed_pings_ = 0; | 248 uint32_t failed_pings_ = 0; |
| 249 bool io_task_running_ = false; | 249 bool io_task_running_ = false; |
| 250 bool audio_task_running_ = false; | 250 bool audio_task_running_ = false; |
| 251 ThreadStatus audio_thread_status_ = THREAD_NONE; | 251 ThreadStatus audio_thread_status_ = THREAD_NONE; |
| 252 bool enable_crash_key_logging_ = false; | 252 bool enable_crash_key_logging_ = false; |
| 253 uint32_t successful_pings_ = 0; | 253 uint32_t successful_pings_ = 0; |
| 254 | 254 |
| 255 #if defined(OS_WIN) | 255 #if defined(OS_WIN) |
| 256 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_; | 256 std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_; |
|
danakj
2016/04/22 22:47:35
include memory
dcheng
2016/04/22 23:13:19
Already included in related header.
| |
| 257 #endif | 257 #endif |
| 258 | 258 |
| 259 #if defined(OS_LINUX) | 259 #if defined(OS_LINUX) |
| 260 std::string app_name_; | 260 std::string app_name_; |
| 261 #endif | 261 #endif |
| 262 | 262 |
| 263 DISALLOW_COPY_AND_ASSIGN(AudioManagerHelper); | 263 DISALLOW_COPY_AND_ASSIGN(AudioManagerHelper); |
| 264 }; | 264 }; |
| 265 | 265 |
| 266 base::LazyInstance<AudioManagerHelper>::Leaky g_helper = | 266 base::LazyInstance<AudioManagerHelper>::Leaky g_helper = |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 403 std::string AudioManager::GetCommunicationsDeviceName() { | 403 std::string AudioManager::GetCommunicationsDeviceName() { |
| 404 #if defined(OS_WIN) | 404 #if defined(OS_WIN) |
| 405 return GetLocalizedStringUTF8(COMMUNICATIONS_AUDIO_DEVICE_NAME); | 405 return GetLocalizedStringUTF8(COMMUNICATIONS_AUDIO_DEVICE_NAME); |
| 406 #else | 406 #else |
| 407 NOTREACHED(); | 407 NOTREACHED(); |
| 408 return ""; | 408 return ""; |
| 409 #endif | 409 #endif |
| 410 } | 410 } |
| 411 | 411 |
| 412 } // namespace media | 412 } // namespace media |
| OLD | NEW |