Index: chrome/browser/speech/speech_input_bubble_controller.cc |
diff --git a/chrome/browser/speech/speech_input_bubble_controller.cc b/chrome/browser/speech/speech_input_bubble_controller.cc |
index 2dd9a8bccad60d380487a760b2c9ee127eadb63d..a47cb1fe2533b3a72d5c8d44520dcf8eba52db9a 100644 |
--- a/chrome/browser/speech/speech_input_bubble_controller.cc |
+++ b/chrome/browser/speech/speech_input_bubble_controller.cc |
@@ -52,28 +52,29 @@ void SpeechInputBubbleController::CreateBubble(int caller_id, |
} |
void SpeechInputBubbleController::CloseBubble(int caller_id) { |
- ProcessRequestInUiThread(caller_id, REQUEST_CLOSE, string16(), 0); |
+ ProcessRequestInUiThread(caller_id, REQUEST_CLOSE, string16(), 0, 0); |
} |
void SpeechInputBubbleController::SetBubbleRecordingMode(int caller_id) { |
ProcessRequestInUiThread(caller_id, REQUEST_SET_RECORDING_MODE, |
- string16(), 0); |
+ string16(), 0, 0); |
} |
void SpeechInputBubbleController::SetBubbleRecognizingMode(int caller_id) { |
ProcessRequestInUiThread(caller_id, REQUEST_SET_RECOGNIZING_MODE, |
- string16(), 0); |
+ string16(), 0, 0); |
} |
void SpeechInputBubbleController::SetBubbleInputVolume(int caller_id, |
- float volume) { |
+ float volume, |
+ float noise_volume) { |
ProcessRequestInUiThread(caller_id, REQUEST_SET_INPUT_VOLUME, string16(), |
- volume); |
+ volume, noise_volume); |
} |
void SpeechInputBubbleController::SetBubbleMessage(int caller_id, |
const string16& text) { |
- ProcessRequestInUiThread(caller_id, REQUEST_SET_MESSAGE, text, 0); |
+ ProcessRequestInUiThread(caller_id, REQUEST_SET_MESSAGE, text, 0, 0); |
} |
void SpeechInputBubbleController::UpdateTabContentsSubscription( |
@@ -131,11 +132,12 @@ void SpeechInputBubbleController::Observe(NotificationType type, |
} |
void SpeechInputBubbleController::ProcessRequestInUiThread( |
- int caller_id, RequestType type, const string16& text, float volume) { |
+ int caller_id, RequestType type, const string16& text, float volume, |
+ float noise_volume) { |
if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) { |
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod( |
this, &SpeechInputBubbleController::ProcessRequestInUiThread, |
- caller_id, type, text, volume)); |
+ caller_id, type, text, volume, noise_volume)); |
return; |
} |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
@@ -164,7 +166,7 @@ void SpeechInputBubbleController::ProcessRequestInUiThread( |
bubble->SetMessage(text); |
break; |
case REQUEST_SET_INPUT_VOLUME: |
- bubble->SetInputVolume(volume); |
+ bubble->SetInputVolume(volume, noise_volume); |
break; |
case REQUEST_CLOSE: |
if (current_bubble_caller_id_ == caller_id) |