Extend speech input bubble in Mac to display error messages with try-again and cancel buttons.

The SpeechInputBubbleImpl object now lives longer than the actual info bubble window, and
allows the caller to create a bubble on screen or update with an error message when needed.

When recording speech, the layout of controls are (vertical):
- Label ('Speak now')
- Icon (Mic or wait)
- Button Bar (Horizontal, 1 button, 'Cancel')

When showing a message, the layout of controls are (vertical):
- Label (message text)
- Button Bar (Horizontal, 2 buttons, 'Try Again' and 'Cancel')

Also made a small correction to the info bubble's anchor point to get the arrow point at the correct starting point of the given element rect.

XIB changes:
- Added a 'try again' button and hooked it up to the tryAgainButton outlet in the controller
- Moved position of the cancel button for easier editing in interface builder

BUG=53598
TEST=manual, unplug mic and start recognition to check error message, and similarly give no speech to check.

Review URL: http://codereview.chromium.org/3438002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60112 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 55 insertions, 0 deletions

diff --git a/chrome/browser/speech/speech_input_bubble_browsertest.cc b/chrome/browser/speech/speech_input_bubble_browsertest.cc
new file mode 100644
index 0000000..fb96593
--- /dev/null
+++ b/chrome/browser/speech/speech_input_bubble_browsertest.cc
@@ -0,0 +1,55 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/scoped_ptr.h"
+#include "chrome/browser/speech/speech_input_bubble.h"
+#include "chrome/browser/browser.h"
+#include "chrome/test/in_process_browser_test.h"
+#include "gfx/rect.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+class SpeechInputBubbleTest : public SpeechInputBubbleDelegate,
+                              public InProcessBrowserTest {
+ public:
+  // SpeechInputBubble::Delegate methods.
+  virtual void InfoBubbleButtonClicked(SpeechInputBubble::Button button) {}
+  virtual void InfoBubbleFocusChanged() {}
+
+ protected:
+};
+
+IN_PROC_BROWSER_TEST_F(SpeechInputBubbleTest, CreateAndDestroy) {
+  gfx::Rect element_rect(100, 100, 100, 100);
+  scoped_ptr<SpeechInputBubble> bubble(SpeechInputBubble::Create(
+      browser()->GetSelectedTabContents(), this, element_rect));
+  EXPECT_TRUE(bubble.get());
+}
+
+IN_PROC_BROWSER_TEST_F(SpeechInputBubbleTest, ShowAndDestroy) {
+  gfx::Rect element_rect(100, 100, 100, 100);
+  scoped_ptr<SpeechInputBubble> bubble(SpeechInputBubble::Create(
+      browser()->GetSelectedTabContents(), this, element_rect));
+  EXPECT_TRUE(bubble.get());
+  bubble->Show();
+}
+
+IN_PROC_BROWSER_TEST_F(SpeechInputBubbleTest, ShowAndHide) {
+  gfx::Rect element_rect(100, 100, 100, 100);
+  scoped_ptr<SpeechInputBubble> bubble(SpeechInputBubble::Create(
+      browser()->GetSelectedTabContents(), this, element_rect));
+  EXPECT_TRUE(bubble.get());
+  bubble->Show();
+  bubble->Hide();
+}
+
+IN_PROC_BROWSER_TEST_F(SpeechInputBubbleTest, ShowAndHideTwice) {
+  gfx::Rect element_rect(100, 100, 100, 100);
+  scoped_ptr<SpeechInputBubble> bubble(SpeechInputBubble::Create(
+      browser()->GetSelectedTabContents(), this, element_rect));
+  EXPECT_TRUE(bubble.get());
+  bubble->Show();
+  bubble->Hide();
+  bubble->Show();
+  bubble->Hide();
+}