Merge 157777 - Speech Input: always abort when user clicks outside speech bubble.

chrome/browser/speech/chrome_speech_recognition_manager_delegate.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/chrome_speech_recognition_manager_delegate.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 255 matching lines @@
   // event (corresponding to the old session that should be aborted) can be
   // received after a new session (corresponding to the 2nd click) is started.
   if (GetBubbleController()->GetActiveSessionID() != session_id)
     return;
 
   // Note, the session might have been destroyed, therefore avoid calls to the
   // manager which imply its existance (e.g., GetSessionContext()).
   GetBubbleController()->CloseBubble();
   last_session_config_.reset();
 
-  // If the user clicks outside the bubble while capturing audio we abort the
-  // session. Otherwise, i.e. audio capture is ended and we are just waiting for
-  // results, this activity is carried silently in background.
-  if (SpeechRecognitionManager::GetInstance()->IsCapturingAudio())
-    SpeechRecognitionManager::GetInstance()->AbortSession(session_id);
+  // Clicking outside the bubble means we should abort.
+  SpeechRecognitionManager::GetInstance()->AbortSession(session_id);
 }
 
 void ChromeSpeechRecognitionManagerDelegate::RestartLastSession() {
   DCHECK(last_session_config_.get());
   SpeechRecognitionManager* manager = SpeechRecognitionManager::GetInstance();
   const int new_session_id = manager->CreateSession(*last_session_config_);
   DCHECK_NE(SpeechRecognitionManager::kSessionIDInvalid, new_session_id);
   last_session_config_.reset();
   manager->StartSession(new_session_id);
 }
@@ skipping 279 matching lines @@
 
 SpeechRecognitionTrayIconController*
 ChromeSpeechRecognitionManagerDelegate::GetTrayIconController() {
   if (!tray_icon_controller_.get())
     tray_icon_controller_ = new SpeechRecognitionTrayIconController();
   return tray_icon_controller_.get();
 }
 
 
 }  // namespace speech