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/ime/ime_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/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_whitelist.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"
@@ skipping 23 matching lines @@
                                            NetworkMenuIcon* network_icon,
                                            NetworkMenu* network_menu) {
   ash::NetworkIconInfo info;
   info.name = UTF8ToUTF16(network->name());
   info.image = network_icon->GetBitmap(network, NetworkMenuIcon::SIZE_SMALL);
   info.service_path = network->service_path();
   info.highlight = network_menu->ShouldHighlightNetwork(network);
   return info;
 }
 
+void BluetoothPowerFailure() {

[sadrul, 2012/03/21 05:41:31]

Is it necessary to do anything here?

[keybuk, 2012/03/21 14:58:57]

you should probably present an error to the user to tell them an action they
tried to perform failed

[sadrul, 2012/03/21 15:52:34]

I have added a TODO here. I will discuss with the UX folks no how to show the
error.

+}
+
 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 input_method::InputMethodManager::Observer,
                            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 26 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() {

[keybuk, 2012/03/21 14:50:32]

Since you have a BluetoothAdapter instance and have registered yourself as an
observer, you need:

  bluetooth_adapter_->RemoveObserver(this)

here

[sadrul, 2012/03/21 14:55:40]

I didn't do it since bluetooth_adapter_ gets destroyed here anyway. But I will
add.

[keybuk, 2012/03/21 14:58:57]

sure, but it's safer to do so, since the CreateDefaultAdapter() method might
change in implementation to return refptrs or similar later

[sadrul, 2012/03/21 15:52:34]

Aha, good point! Done.

     AudioHandler* audiohandler = AudioHandler::GetInstance();
     if (audiohandler)
       audiohandler->RemoveVolumeObserver(this);
     DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
     input_method::InputMethodManager::GetInstance()->RemoveObserver(this);
     system::TimezoneSettings::GetInstance()->RemoveObserver(this);
     if (SystemKeyEventListener::GetInstance())
       SystemKeyEventListener::GetInstance()->RemoveCapsLockObserver(this);
   }
 
@@ skipping 48 matching lines @@
   }
 
   virtual void ShowDateSettings() OVERRIDE {
     GetAppropriateBrowser()->OpenAdvancedOptionsDialog();
   }
 
   virtual void ShowNetworkSettings() OVERRIDE {
     GetAppropriateBrowser()->OpenInternetOptionsDialog();
   }
 
+  virtual void ShowBluetoothSettings() OVERRIDE {
+    // TODO
+  }
+
   virtual void ShowHelp() OVERRIDE {
     GetAppropriateBrowser()->ShowHelpTab();
   }
 
   virtual bool IsAudioMuted() const OVERRIDE {
     return AudioHandler::GetInstance()->IsMuted();
   }
 
   virtual void SetAudioMuted(bool muted) OVERRIDE {
     return AudioHandler::GetInstance()->SetMuted(muted);
@@ skipping 23 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();
+    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::IMEInfoList GetAvailableIMEList() OVERRIDE {
     ash::IMEInfoList list;
     input_method::InputMethodManager* manager =
         input_method::InputMethodManager::GetInstance();
     input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
     scoped_ptr<input_method::InputMethodDescriptors> ime_descriptors(
         manager->GetActiveInputMethods());
     std::string current = manager->GetCurrentInputMethod().id();
     for (size_t i = 0; i < ime_descriptors->size(); i++) {
       input_method::InputMethodDescriptor& ime = ime_descriptors->at(i);
@@ skipping 71 matching lines @@
     }
   }
 
   virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE {
     NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
     Network* network = crosnet->FindNetworkByPath(network_id);
     if (network)
       network_menu_->ConnectToNetwork(network);
   }
 
+  virtual void AddBluetoothDevice() OVERRIDE {
+    GetAppropriateBrowser()->OpenAddBluetoothDeviceDialog();
+  }
+
   virtual void ToggleAirplaneMode() OVERRIDE {
     NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
     crosnet->EnableOfflineMode(!crosnet->offline_mode());
   }
 
   virtual void ToggleWifi() OVERRIDE {
     network_menu_->ToggleWifi();
   }
 
   virtual void ToggleCellular() OVERRIDE {
     network_menu_->ToggleCellular();
   }
 
+  virtual void ToggleBluetooth() OVERRIDE {
+    bluetooth_adapter_->SetPowered(!bluetooth_adapter_->IsPowered(),
+        base::Bind(&BluetoothPowerFailure));

[keybuk, 2012/03/21 14:50:32]

I couldn't see the definition of BluetoothPowerFailure anywhere

[sadrul, 2012/03/21 14:55:40]

It's in line 71.

+  }
+
   virtual bool GetWifiAvailable() OVERRIDE {
     return CrosLibrary::Get()->GetNetworkLibrary()->wifi_available();
   }
 
   virtual bool GetCellularAvailable() OVERRIDE {
     return CrosLibrary::Get()->GetNetworkLibrary()->cellular_available();
   }
 
+  virtual bool GetBluetoothAvailable() OVERRIDE {
+    return bluetooth_adapter_->IsPresent();
+  }
+
   virtual bool GetWifiEnabled() OVERRIDE {
     return CrosLibrary::Get()->GetNetworkLibrary()->wifi_enabled();
   }
 
   virtual bool GetCellularEnabled() OVERRIDE {
     return CrosLibrary::Get()->GetNetworkLibrary()->cellular_enabled();
   }
 
+  virtual bool GetBluetoothEnabled() OVERRIDE {
+    return bluetooth_adapter_->IsPowered();
+  }
+
   virtual void ChangeProxySettings() OVERRIDE {
     CHECK(GetUserLoginStatus() == ash::user::LOGGED_IN_NONE);
     BaseLoginDisplayHost::default_host()->OpenProxySettings();
   }
 
  private:
   // Returns the last active browser. If there is no such browser, creates a new
   // browser window with an empty tab and returns it.
   Browser* GetAppropriateBrowser() {
     Browser* browser = BrowserList::GetLastActive();
@@ skipping 30 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 NotifyRefreshIME() {
     ash::IMEObserver* observer =
         ash::Shell::GetInstance()->tray()->ime_observer();
     if (observer)
       observer->OnIMERefresh();
   }
 
   void RefreshNetworkObserver(NetworkLibrary* crosnet) {
     const Network* network = crosnet->active_network();
     std::string new_path = network ? network->service_path() : std::string();
@@ skipping 164 matching lines @@
       input_method::InputMethodManager* manager,
       const input_method::InputMethodPropertyList& properties) OVERRIDE {
     NotifyRefreshIME();
   }
 
   // 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?
+  }
+
+  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