Changing tab closure handling logic in speech recognition code and cleaning bubble controller. (Spe…

content/browser/speech/speech_recognition_manager_impl.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 "content/browser/speech/speech_recognition_manager_impl.h"
 
 #include "base/bind.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/speech/google_one_shot_remote_engine.h"
 #include "content/browser/speech/google_streaming_remote_engine.h"
@@ skipping 319 matching lines @@
   for (SessionsTable::iterator it = sessions_.begin(); it != sessions_.end();
        ++it) {
     Session& session = it->second;
     if (session.config.event_listener == listener) {
       AbortSession(session.id);
       session.listener_is_active = false;
     }
   }
 }
 
+void SpeechRecognitionManagerImpl::AbortAllSessionsForRenderer(
+    int render_process_id, int render_view_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  for (SessionsTable::iterator it = sessions_.begin(); it != sessions_.end();
+       ++it) {
+    Session& session = it->second;
+    if (session.context.render_process_id == render_process_id &&
+        session.context.render_view_id == render_view_id) {
+      AbortSession(session.id);
+    }
+  }
+}
+
 // -----------------------  Core FSM implementation ---------------------------
 void SpeechRecognitionManagerImpl::DispatchEvent(int session_id,
                                                  FSMEvent event) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // There are some corner cases in which the session might be deleted (due to
   // an EndRecognition event) between a request (e.g. Abort) and its dispatch.
   if (!SessionExists(session_id))
     return;
 
@@ skipping 178 matching lines @@
 
 SpeechRecognitionManagerImpl::Session::Session()
   : id(kSessionIDInvalid),
     listener_is_active(true) {
 }
 
 SpeechRecognitionManagerImpl::Session::~Session() {
 }
 
 }  // namespace speech