Bluetooth API: improve discovery

chrome/browser/chromeos/extensions/bluetooth_event_router.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_CHROMEOS_EXTENSIONS_BLUETOOTH_EVENT_ROUTER_H_
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_BLUETOOTH_EVENT_ROUTER_H_
 
 #include <map>
 
+#include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_socket.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/extensions/api/experimental_bluetooth.h"
 
 namespace chromeos {
 
 class ExtensionBluetoothEventRouter
     : public chromeos::BluetoothAdapter::Observer {
  public:
   explicit ExtensionBluetoothEventRouter(Profile* profile);
   virtual ~ExtensionBluetoothEventRouter();
 
   const chromeos::BluetoothAdapter* adapter() const { return adapter_.get(); }
   chromeos::BluetoothAdapter* GetMutableAdapter() { return adapter_.get(); }
 
   // Register the BluetoothSocket |socket| for use by the extensions system.
   // This class will hold onto the socket for its lifetime, or until
   // ReleaseSocket is called for the socket.  Returns an id for the socket.
   int RegisterSocket(scoped_refptr<BluetoothSocket> socket);
 
   // Release the BluetoothSocket corresponding to |id|.  Returns true if
   // the socket was found and released, false otherwise.
   bool ReleaseSocket(int id);
 
   // Get the BluetoothSocket corresponding to |id|.
   scoped_refptr<BluetoothSocket> GetSocket(int id);
 
+  // Sets whether this Profile is responsible for the discovering state of the
+  // adapter.
+  void SetResponsibleForDiscovery(bool responsible);
+  bool IsResponsibleForDiscovery() const;
+
   // Sets whether or not DeviceAdded events will be dispatched to extensions.
   void SetSendDiscoveryEvents(bool should_send);
 
   // Override from chromeos::BluetoothAdapter::Observer
   virtual void AdapterPresentChanged(chromeos::BluetoothAdapter* adapter,
                                      bool present) OVERRIDE;
   virtual void AdapterPoweredChanged(chromeos::BluetoothAdapter* adapter,
                                      bool has_power) OVERRIDE;
   virtual void AdapterDiscoveringChanged(chromeos::BluetoothAdapter* adapter,
                                          bool discovering) OVERRIDE;
   virtual void DeviceAdded(chromeos::BluetoothAdapter* adapter,
                            chromeos::BluetoothDevice* device) OVERRIDE;
 
   // Exposed for testing.
   void SetAdapterForTest(chromeos::BluetoothAdapter* adapter) {
     adapter_ = adapter;
   }
  private:
   void DispatchBooleanValueEvent(const char* event_name, bool value);
+  void DispatchDeviceEvent(
+      const extensions::api::experimental_bluetooth::Device& device);
 
   bool send_discovery_events_;
+  bool responsible_for_discovery_;
 
   Profile* profile_;
   scoped_refptr<chromeos::BluetoothAdapter> adapter_;
 
   // The next id to use for referring to a BluetoothSocket.  We avoid using
   // the fd of the socket because we don't want to leak that information to
   // the extension javascript.
   int next_socket_id_;
 
   typedef std::map<int, scoped_refptr<BluetoothSocket> > SocketMap;
   SocketMap socket_map_;
 
+  typedef std::vector<
+      linked_ptr<extensions::api::experimental_bluetooth::Device> >
+      DeviceList;

[asargent_no_longer_on_chrome, 2012/08/03 23:35:23]

Can this be a ScopedVector instead of a vector of linked_ptr's? 

There was a thread recently on chromium-dev where people were saying
ScopedVector is prefererable. I vaguely recall there are some situations where
ScopedVector is less convenient though, so feel free to leave the code as-is if
it isn't easy to switch out.

[bryeung, 2012/08/07 14:22:12]

I had missed that thread: thanks for pointing it out.  Fixed.

+  DeviceList discovered_devices_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionBluetoothEventRouter);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_BLUETOOTH_EVENT_ROUTER_H_