Close SpeechRecognitionBubble on pressing the Escape key.

chrome/browser/ui/views/speech_recognition_bubble_views.cc

 // Copyright (c) 2012 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_recognition_bubble.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 46 matching lines @@
   virtual void Init() OVERRIDE;
 
   // views::ButtonListener methods.
   virtual void ButtonPressed(views::Button* source,
                              const ui::Event& event) OVERRIDE;
 
   // views::LinkListener methods.
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
   // views::View overrides.
+  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
 
   void set_notify_delegate_on_activation_change(bool notify) {
     notify_delegate_on_activation_change_ = notify;
   }
 
  private:
   SpeechRecognitionBubbleDelegate* delegate_;
   gfx::Rect element_rect_;
@@ skipping 25 matching lines @@
       heading_(NULL),
       message_(NULL),
       try_again_(NULL),
       cancel_(NULL),
       mic_settings_(NULL),
       display_mode_(SpeechRecognitionBubbleBase::DISPLAY_MODE_WARM_UP),
       kIconLayoutMinWidth(ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
                           IDR_SPEECH_INPUT_MIC_EMPTY)->width()) {
   // The bubble lifetime is managed by its controller; closing on escape or
   // explicitly closing on deactivation will cause unexpected behavior.
   set_close_on_esc(false);

[msw, 2014/02/20 18:30:20]

Why not just remove this line? Many bubbles close on escape like that.

[Elliot Glaysher, 2014/02/20 18:59:18]

Might have to figure out why closing on escape is unexpected by the controller.
Mike, it looks like you wrote that comment. Is it out of date?

[msw, 2014/02/20 21:57:24]

Ah, right... that comment is probably still valid, hence the need to alert the
delegate that 'cancel was clicked'.

   set_close_on_deactivate(false);
 }
 
 void SpeechRecognitionBubbleView::OnWidgetActivationChanged(
     views::Widget* widget, bool active) {
   if (widget == GetWidget() && !active && notify_delegate_on_activation_change_)
     delegate_->InfoBubbleFocusChanged();
   BubbleDelegateView::OnWidgetActivationChanged(widget, active);
 }
 
@@ skipping 95 matching lines @@
     NOTREACHED() << "Unknown button";
   }
 }
 
 void SpeechRecognitionBubbleView::LinkClicked(views::Link* source,
                                               int event_flags) {
   DCHECK_EQ(mic_settings_, source);
   content::SpeechRecognitionManager::GetInstance()->ShowAudioInputSettings();
 }
 
+bool SpeechRecognitionBubbleView::AcceleratorPressed(
+    const ui::Accelerator& accelerator) {
+  // The accelerator is added by BubbleDelegateView.
+  if (accelerator.key_code() == ui::VKEY_ESCAPE) {
+    delegate_->InfoBubbleButtonClicked(SpeechRecognitionBubble::BUTTON_CANCEL);
+    return true;
+  }
+
+  return false;

[msw, 2014/02/20 21:57:24]

This should be: return BubbleDelegateView::AcceleratorPressed(accelerator);

+}
+
 gfx::Size SpeechRecognitionBubbleView::GetPreferredSize() {
   int width = heading_->GetPreferredSize().width();
   int control_width = cancel_->GetPreferredSize().width();
   if (try_again_->visible()) {
     control_width += try_again_->GetPreferredSize().width() +
                      views::kRelatedButtonHSpacing;
   }
   width = std::max(width, control_width);
   control_width = std::max(icon_->GetPreferredSize().width(),
                            kIconLayoutMinWidth);
@@ skipping 157 matching lines @@
 }
 
 }  // namespace
 
 SpeechRecognitionBubble* SpeechRecognitionBubble::CreateNativeBubble(
     WebContents* web_contents,
     SpeechRecognitionBubble::Delegate* delegate,
     const gfx::Rect& element_rect) {
   return new SpeechRecognitionBubbleImpl(web_contents, delegate, element_rect);
 }