summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-23 17:58:08 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-23 17:58:08 +0000
commitb4329dc5eb2479619709d35c4bec1ca7a6659507 (patch)
treedb8153bd676802a8224e44c7b1c379181efbd687 /chrome/browser/cocoa
parent0b5cabf89066b80446138ecfe288af25a5f4e3f9 (diff)
downloadchromium_src-b4329dc5eb2479619709d35c4bec1ca7a6659507.zip
chromium_src-b4329dc5eb2479619709d35c4bec1ca7a6659507.tar.gz
chromium_src-b4329dc5eb2479619709d35c4bec1ca7a6659507.tar.bz2
When waiting for server, show a 'Working' message instead of 'Speak now'.
Also request the server to return a max of 3 results in the response. This is in preparation to test multiple recognition results in a future CL. BUG=none TEST=no change in functionality. Review URL: http://codereview.chromium.org/5281003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/speech_input_window_controller.mm7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/speech_input_window_controller.mm b/chrome/browser/cocoa/speech_input_window_controller.mm
index 76d1dd1..005f37a 100644
--- a/chrome/browser/cocoa/speech_input_window_controller.mm
+++ b/chrome/browser/cocoa/speech_input_window_controller.mm
@@ -146,12 +146,15 @@ const int kBubbleHorizontalMargin = 5; // Space on either sides of controls.
[iconImage_ setHidden:YES];
[tryAgainButton_ setHidden:NO];
} else {
- [instructionLabel_ setStringValue:l10n_util::GetNSString(
- IDS_SPEECH_INPUT_BUBBLE_HEADING)];
if (mode == SpeechInputBubbleBase::DISPLAY_MODE_RECORDING) {
+ [instructionLabel_ setStringValue:l10n_util::GetNSString(
+ IDS_SPEECH_INPUT_BUBBLE_HEADING)];
NSImage* icon = ResourceBundle::GetSharedInstance().GetNativeImageNamed(
IDR_SPEECH_INPUT_MIC_EMPTY);
[iconImage_ setImage:icon];
+ } else {
+ [instructionLabel_ setStringValue:l10n_util::GetNSString(
+ IDS_SPEECH_INPUT_BUBBLE_WORKING)];
}
[iconImage_ setHidden:NO];
[iconImage_ setNeedsDisplay:YES];