Show error messages in speech bubble allowing user to retry as well.

chrome/browser/speech/speech_input_bubble_views.cc

 // 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 "chrome/browser/speech/speech_input_bubble.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser.h"
@@ skipping 66 matching lines @@
 }
 
 void ContentView::SetRecognizingMode() {
   icon_->SetImage(*ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_SPEECH_INPUT_PROCESSING));
 }
 
 void ContentView::ButtonPressed(views::Button* source,
                                 const views::Event& event) {
   if (source == cancel_) {
-    delegate_->RecognitionCancelled();
+    delegate_->InfoBubbleButtonClicked(SpeechInputBubble::BUTTON_CANCEL);
   } else {
     NOTREACHED() << "Unknown view";
   }
 }
 
 gfx::Size ContentView::GetPreferredSize() {
   int width = heading_->GetPreferredSize().width();
   int control_width = cancel_->GetPreferredSize().width();
   if (control_width > width)
     width = control_width;
@@ skipping 21 matching lines @@
   height = icon_->GetImage().height();
   icon_->SetBounds(x, y, control_width, height);
   y += height;
 
   height = cancel_->GetPreferredSize().height();
   cancel_->SetBounds(x, y, control_width, height);
 }
 
 // Implementation of SpeechInputBubble.
 class SpeechInputBubbleImpl
-    : public SpeechInputBubble,
+    : public SpeechInputBubbleBase,
       public InfoBubbleDelegate,
       public NotificationObserver {
  public:
   SpeechInputBubbleImpl(TabContents* tab_contents,
                         Delegate* delegate,
                         const gfx::Rect& element_rect);
   virtual ~SpeechInputBubbleImpl();
 
   virtual void SetRecognizingMode();
 
+  // SpeechInputBubble methods.
+  virtual void Show();
+  virtual void Hide();
+  virtual void UpdateLayout();
+
   // Returns the screen rectangle to use as the info bubble's target.
   // |element_rect| is the html element's bounds in page coordinates.
   gfx::Rect GetInfoBubbleTarget(const gfx::Rect& element_rect);
 
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // InfoBubbleDelegate
@@ skipping 63 matching lines @@
   tab_contents_->GetContainerBounds(&container_rect);
   return gfx::Rect(
       container_rect.x() + element_rect.x() + kBubbleTargetOffsetX,
       container_rect.y() + element_rect.y() + element_rect.height(), 1, 1);
 }
 
 void SpeechInputBubbleImpl::Observe(NotificationType type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
   if (type == NotificationType::TAB_CONTENTS_DESTROYED) {
-    delegate_->RecognitionCancelled();
+    delegate_->InfoBubbleButtonClicked(BUTTON_CANCEL);
   } else {
     NOTREACHED() << "Unknown notification";
   }
 }
 
 void SpeechInputBubbleImpl::InfoBubbleClosing(InfoBubble* info_bubble,
                                           bool closed_by_escape) {
   registrar_.Remove(this, NotificationType::TAB_CONTENTS_DESTROYED,
                     Source<TabContents>(tab_contents_));
   info_bubble_ = NULL;
   bubble_content_ = NULL;
   if (!did_invoke_close_)
-    delegate_->InfoBubbleClosed();
+    delegate_->InfoBubbleFocusChanged();
 }
 
 bool SpeechInputBubbleImpl::CloseOnEscape() {
   return false;
 }
 
 bool SpeechInputBubbleImpl::FadeInOnShow() {
   return false;
 }
 
+void SpeechInputBubbleImpl::Show() {
+  // TODO(satish): Implement.
+  NOTREACHED();
+}
+
+void SpeechInputBubbleImpl::Hide() {
+  // TODO(satish): Implement.
+  NOTREACHED();
+}
+
+void SpeechInputBubbleImpl::UpdateLayout() {
+  // TODO: Implement.
+  NOTREACHED();
+}
+
 }  // namespace
 
 SpeechInputBubble* SpeechInputBubble::CreateNativeBubble(
     TabContents* tab_contents,
     SpeechInputBubble::Delegate* delegate,
     const gfx::Rect& element_rect) {
   return new SpeechInputBubbleImpl(tab_contents, delegate, element_rect);
 }