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

chrome/browser/speech/tab_watcher.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_TAB_WATCHER_H_
+#define CHROME_BROWSER_SPEECH_TAB_WATCHER_H_
+#pragma once
+
+#include <set>
+
+#include "base/callback.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/notification_observer.h"
+
+namespace content {
+class NotificationRegistrar;
+class WebContents;
+}
+
+// Simple utility class that allows to watch for tabs (or more precisely,
+// WebContents in general) closure, being notified by a callback on a custom
+// thread. Both the callback site and the callback thread are defined by the
+// caller in the constructor.
+// There is no restriction on the constructor, however this class must be
+// destroyed on the UI thread, due to the NotificationRegistrar dependency.

[hans, 2012/06/26 13:10:44]

i wonder if the description could be shorted a little... "Simple utility to get
a callback when a tab closes." ?

[Primiano Tucci (use gerrit), 2012/06/26 14:27:07]

Done.

+class TabWatcher
+    :  public base::RefCountedThreadSafe<TabWatcher>,

[hans, 2012/06/26 13:10:44]

looks like some extra space between the : and the p

[Primiano Tucci (use gerrit), 2012/06/26 14:27:07]

Done.

+       public content::NotificationObserver {
+ public:
+  typedef base::Callback<void(int render_process_id, int render_view_id)>
+      TabClosedCallback;
+
+  TabWatcher(TabClosedCallback tab_closed_callback,
+             content::BrowserThread::ID callback_thread);
+
+  void Watch(int render_process_id, int render_view_id);
+
+ private:
+  friend class base::RefCountedThreadSafe<TabWatcher>;
+
+  static void AbortAllSessionsForWebContentOnIOThread(int render_process_id,

[hans, 2012/06/26 13:10:44]

what does this do? what's a session in the context of TabWatcher?
Hmm, I can't even find where this is defined.. doesn't seem to be in the .cc
file?

[Primiano Tucci (use gerrit), 2012/06/26 14:27:07]

Ops, I guess it was just a too large copy/paste, which unfortunately did not end
into any compiler error :/

+                                                      int render_view_id);
+  virtual ~TabWatcher();
+
+  // content::NotificationObserver implementation.
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE;
+
+  // Lazy-initialized and used in the UI thread to handle web contents
+  // notifications (tab closing).
+  scoped_ptr<content::NotificationRegistrar> registrar_;
+
+  // Keeps track of which WebContent(s) have been registered, in order to avoid
+  // double registrations on |registrar_|
+  std::set<content::WebContents*> registered_contents_;
+
+  // Callback used to notify, on the thread specified by |callback_thread_| the
+  // closure of a registered tab.
+  TabClosedCallback tab_closed_callback_;
+  content::BrowserThread::ID callback_thread_;
+
+  DISALLOW_COPY_AND_ASSIGN(TabWatcher);
+};
+
+#endif  // CHROME_BROWSER_SPEECH_TAB_WATCHER_H_