ash: Add a bluetooth entry in the uber tray.

chrome/browser/chromeos/system/ash_system_tray_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/chromeos/system/ash_system_tray_delegate.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/audio_observer.h"
+#include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/brightness/brightness_observer.h"
 #include "ash/system/network/network_observer.h"
 #include "ash/system/power/clock_observer.h"
 #include "ash/system/power/power_status_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/tray_caps_lock.h"
 #include "ash/system/user/update_observer.h"
 #include "ash/system/user/user_observer.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ skipping 31 matching lines @@
 class SystemTrayDelegate : public ash::SystemTrayDelegate,
                            public AudioHandler::VolumeObserver,
                            public PowerManagerClient::Observer,
                            public NetworkMenuIcon::Delegate,
                            public NetworkMenu::Delegate,
                            public NetworkLibrary::NetworkManagerObserver,
                            public NetworkLibrary::NetworkObserver,
                            public NetworkLibrary::CellularDataPlanObserver,
                            public content::NotificationObserver,
                            public system::TimezoneSettings::Observer,
+                           public BluetoothAdapter::Observer,
                            public SystemKeyEventListener::CapsLockObserver {
  public:
   explicit SystemTrayDelegate(ash::SystemTray* tray)
       : tray_(tray),
         network_icon_(ALLOW_THIS_IN_INITIALIZER_LIST(
                       new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))),
         network_icon_large_(ALLOW_THIS_IN_INITIALIZER_LIST(
                       new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))),
         network_menu_(ALLOW_THIS_IN_INITIALIZER_LIST(new NetworkMenu(this))),
         clock_type_(base::k24HourClock) {
@@ skipping 24 matching lines @@
     registrar_.Add(this,
                    chrome::NOTIFICATION_SESSION_STARTED,
                    content::NotificationService::AllSources());
 
     SetProfile(ProfileManager::GetDefaultProfile());
 
     network_icon_large_->SetResourceSize(NetworkMenuIcon::SIZE_LARGE);
 
     accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled,
                                 g_browser_process->local_state(), this);
+
+    bluetooth_adapter_.reset(BluetoothAdapter::CreateDefaultAdapter());
+    bluetooth_adapter_->AddObserver(this);
   }
 
   virtual ~SystemTrayDelegate() {
     AudioHandler* audiohandler = AudioHandler::GetInstance();
     if (audiohandler)
       audiohandler->RemoveVolumeObserver(this);
     DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
     system::TimezoneSettings::GetInstance()->RemoveObserver(this);
     if (SystemKeyEventListener::GetInstance())
       SystemKeyEventListener::GetInstance()->RemoveCapsLockObserver(this);
@@ skipping 93 matching lines @@
 
   virtual void SignOut() OVERRIDE {
     BrowserList::AttemptUserExit();
   }
 
   virtual void RequestLockScreen() OVERRIDE {
     DBusThreadManager::Get()->GetPowerManagerClient()->
         NotifyScreenLockRequested();
   }
 
+  virtual ash::BluetoothDeviceList GetAvailableBluetoothDevices() OVERRIDE {
+    BluetoothAdapter::DeviceList devices = bluetooth_adapter_->GetDevices();

[sadrul, 2012/03/20 21:40:24]

Is 'GetDevice' an expensive operation? If it is, then I would optimize
NotifyRefreshBluetooth below to make sure the tray-item does not have to query
the list of all devices everytime. (I will probably do that anyway, since we get
enough information in the observer-callbacks, but I took the easiest path to get
something working).

[keybuk, 2012/03/20 21:59:58]

It's expensive only in that it makes a vector of pointers for you.

It involves no round trips to the adapter, and only returns cached information.
I would not add a second-level cache of your own, this function is sufficient
for that :)

[sadrul, 2012/03/20 22:02:37]

Excellent!

+    ash::BluetoothDeviceList list;
+    for (size_t i = 0; i < devices.size(); ++i) {
+      BluetoothDevice* device = devices[i];
+      ash::BluetoothDeviceInfo info;
+      info.address = device->address();
+      info.display_name = device->GetName();
+      info.connected = device->IsConnected();
+
+      list.push_back(info);
+    }
+    return list;
+  }
+
   virtual ash::NetworkIconInfo GetMostRelevantNetworkIcon(bool large) OVERRIDE {
     ash::NetworkIconInfo info;
     info.image = !large ? network_icon_->GetIconAndText(&info.description) :
         network_icon_large_->GetIconAndText(&info.description);
     return info;
   }
 
   virtual void GetAvailableNetworks(
       std::vector<ash::NetworkIconInfo>* list) OVERRIDE {
     NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
@@ skipping 130 matching lines @@
   void NotifyRefreshNetwork() {
     ash::NetworkObserver* observer =
         ash::Shell::GetInstance()->tray()->network_observer();
     if (observer) {
       ash::NetworkIconInfo info;
       info.image = network_icon_->GetIconAndText(&info.description);
       observer->OnNetworkRefresh(info);
     }
   }
 
+  void NotifyRefreshBluetooth() {
+    ash::BluetoothObserver* observer =
+        ash::Shell::GetInstance()->tray()->bluetooth_observer();
+    if (observer)
+      observer->OnBluetoothRefresh();
+  }
+
   void RefreshNetworkObserver(NetworkLibrary* crosnet) {
     const Network* network = crosnet->active_network();
     std::string new_path = network ? network->service_path() : std::string();
     if (active_network_path_ != new_path) {
       if (!active_network_path_.empty())
         crosnet->RemoveNetworkObserver(active_network_path_, this);
       if (!new_path.empty())
         crosnet->AddNetworkObserver(new_path, this);
       active_network_path_ = new_path;
     }
@@ skipping 136 matching lines @@
       default:
         NOTREACHED();
     }
   }
 
   // Overridden from system::TimezoneSettings::Observer.
   virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE {
     NotifyRefreshClock();
   }
 
+  // Overridden from BluetoothAdapter::Observer.
+  virtual void AdapterPresentChanged(BluetoothAdapter* adapter,
+                                     bool present) OVERRIDE {
+    NotifyRefreshBluetooth();
+  }
+
+  virtual void AdapterPoweredChanged(BluetoothAdapter* adapter,
+                                     bool powered) OVERRIDE {
+    NotifyRefreshBluetooth();
+  }
+
+  virtual void AdapterDiscoveringChanged(BluetoothAdapter* adapter,
+                                         bool discovering) OVERRIDE {
+    // Not necessary to do anything here?

[keybuk, 2012/03/20 21:59:58]

You may want to do cutesy flashing animations or something maybe, but no, in
general you don't need this and can just omit the function (the default
implementation is provided)

[sadrul, 2012/03/20 22:02:37]

I will leave a TODO to cutesify :)

+  }
+
+  virtual void DeviceAdded(BluetoothAdapter* adapter,
+                           BluetoothDevice* device) OVERRIDE {
+    NotifyRefreshBluetooth();
+  }
+
+  virtual void DeviceChanged(BluetoothAdapter* adapter,
+                             BluetoothDevice* device) OVERRIDE {
+    NotifyRefreshBluetooth();
+  }
+
+  virtual void DeviceRemoved(BluetoothAdapter* adapter,
+                             BluetoothDevice* device) OVERRIDE {
+    NotifyRefreshBluetooth();
+  }
+
   // Overridden from SystemKeyEventListener::CapsLockObserver.
   virtual void OnCapsLockChange(bool enabled) OVERRIDE {
     ash::CapsLockObserver* observer =
       ash::Shell::GetInstance()->tray()->caps_lock_observer();
     if (observer)
       observer->OnCapsLockChanged(enabled);
   }
 
   ash::SystemTray* tray_;
   scoped_ptr<NetworkMenuIcon> network_icon_;
   scoped_ptr<NetworkMenuIcon> network_icon_large_;
   scoped_ptr<NetworkMenu> network_menu_;
   content::NotificationRegistrar registrar_;
   scoped_ptr<PrefChangeRegistrar> pref_registrar_;
   std::string cellular_device_path_;
   std::string active_network_path_;
   scoped_ptr<LoginHtmlDialog> proxy_settings_dialog_;
   PowerSupplyStatus power_supply_status_;
   base::HourClockType clock_type_;
 
+  scoped_ptr<BluetoothAdapter> bluetooth_adapter_;
+
   BooleanPrefMember accessibility_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
   return new chromeos::SystemTrayDelegate(tray);
 }
 
 }  // namespace chromeos