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

chrome/browser/speech/chrome_speech_recognition_manager_delegate.h

 // 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.
 
 #ifndef CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
 #define CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/speech/speech_recognition_bubble_controller.h"
 #include "content/public/browser/speech_recognition_event_listener.h"
 #include "content/public/browser/speech_recognition_manager_delegate.h"
 #include "content/public/browser/speech_recognition_session_config.h"
 
 class SpeechRecognitionTrayIconController;
 
 namespace speech {
-
 // This is Chrome's implementation of the SpeechRecognitionManagerDelegate
 // interface.
 class ChromeSpeechRecognitionManagerDelegate
     : NON_EXPORTED_BASE(public content::SpeechRecognitionManagerDelegate),
       public content::SpeechRecognitionEventListener,
       public SpeechRecognitionBubbleControllerDelegate {
  public:
   ChromeSpeechRecognitionManagerDelegate();
   virtual ~ChromeSpeechRecognitionManagerDelegate();
 
@@ skipping 21 matching lines @@
   // SpeechRecognitionManagerDelegate methods.
   virtual void GetDiagnosticInformation(bool* can_report_metrics,
                                         std::string* hardware_info) OVERRIDE;
   virtual void CheckRecognitionIsAllowed(
       int session_id,
       base::Callback<void(int session_id, bool is_allowed)> callback) OVERRIDE;
   virtual content::SpeechRecognitionEventListener* GetEventListener() OVERRIDE;
 
  private:
   class OptionalRequestInfo;
+  class TabWatcher;
 
   // Shows the recognition tray icon for a given |context_name|, eventually
   // with a notification balloon. The balloon is shown only once per profile
   // for a given context_name. |render_process_id| is required to lookup the
   // profile associated with the renderer that initiated the recognition.
   static void ShowTrayIconOnUIThread(
       const std::string& context_name,
       int render_process_id,
       scoped_refptr<SpeechRecognitionTrayIconController> tray_icon_controller);
 
   // Checks for VIEW_TYPE_TAB_CONTENTS host in the UI thread and notifies back
   // the result in the IO thread through |callback|.
   static void CheckRenderViewType(
       int session_id,
       base::Callback<void(int session_id, bool is_allowed)> callback,
       int render_process_id,
       int render_view_id);
 
   // Starts a new recognition session, using the config of the last one
   // (which is copied into |last_session_config_|). Used for "try again".
   void RestartLastSession();
 
+  // Callback called by |tab_watcher_| on the IO thread to signal tab closure.
+  void TabClosedCallback(int render_process_id, int render_view_id);
+
   // Lazy initializers for bubble and tray icon controller.
   SpeechRecognitionBubbleController* GetBubbleController();
   SpeechRecognitionTrayIconController* GetTrayIconController();
 
   scoped_refptr<SpeechRecognitionBubbleController> bubble_controller_;
   scoped_refptr<SpeechRecognitionTrayIconController> tray_icon_controller_;
   scoped_refptr<OptionalRequestInfo> optional_request_info_;
   scoped_ptr<content::SpeechRecognitionSessionConfig> last_session_config_;
-
-  // TODO(primiano) this information should be kept into the bubble_controller_.
-  int active_bubble_session_id_;
+  scoped_refptr<TabWatcher> tab_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionManagerDelegate);
 };
 
 }  // namespace speech
 
 #endif  // CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_