Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Side by Side Diff: chrome/browser/chromeos/audio/audio_mixer_cras.cc

Issue 9808024: Move TTS extension API to chrome/browser/speech/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chromeos compile error, rebase Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "chrome/browser/chromeos/audio/audio_mixer_cras.h" 5 #include "chrome/browser/chromeos/audio/audio_mixer_cras.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <cras_client.h> 8 #include <cras_client.h>
9 #include <unistd.h> 9 #include <unistd.h>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/message_loop.h" 14 #include "base/message_loop.h"
15 #include "base/threading/thread.h" 15 #include "base/threading/thread.h"
16 #include "base/threading/thread_restrictions.h" 16 #include "base/threading/thread_restrictions.h"
17 #include "chrome/browser/extensions/extension_tts_api_chromeos.h" 17 #include "chrome/browser/speech/extension_api/tts_extension_api_chromeos.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 19
20 using content::BrowserThread; 20 using content::BrowserThread;
21 21
22 namespace chromeos { 22 namespace chromeos {
23 23
24 namespace { 24 namespace {
25 25
26 // Default volume as a percentage in the range [0.0, 100.0]. 26 // Default volume as a percentage in the range [0.0, 100.0].
27 const double kDefaultVolumePercent = 75.0; 27 const double kDefaultVolumePercent = 75.0;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 if (should_mute) { 138 if (should_mute) {
139 cras_client_set_system_mute(client_, should_mute); 139 cras_client_set_system_mute(client_, should_mute);
140 cras_client_set_system_volume(client_, new_volume); 140 cras_client_set_system_volume(client_, new_volume);
141 } else { 141 } else {
142 cras_client_set_system_volume(client_, new_volume); 142 cras_client_set_system_volume(client_, new_volume);
143 cras_client_set_system_mute(client_, should_mute); 143 cras_client_set_system_mute(client_, should_mute);
144 } 144 }
145 } 145 }
146 146
147 } // namespace chromeos 147 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/audio/audio_mixer_alsa.cc ('k') | chrome/browser/extensions/extension_function_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698