M26 new bluetooth UI. List all bluetooth devices in detailed view and automatically discover all BT…

ash/system/bluetooth/tray_bluetooth.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 "ash/system/bluetooth/tray_bluetooth.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
@@ skipping 53 matching lines @@
 
 class BluetoothDetailedView : public TrayDetailsView,
                               public ViewClickListener,
                               public views::ButtonListener {
  public:
   BluetoothDetailedView(SystemTrayItem* owner, user::LoginStatus login)
       : TrayDetailsView(owner),
         login_(login),
         add_device_(NULL),
         toggle_bluetooth_(NULL),
-        enable_bluetooth_(NULL) {
+        enable_bluetooth_(NULL),
+        bluetooth_discovering_(false) {
+    CreateItems();
     Update();
   }
 
-  virtual ~BluetoothDetailedView() {}
+  virtual ~BluetoothDetailedView() {
+    // Stop discovering bluetooth devices when exiting BT detailed view.
+    BluetoothSetDiscovering(false);
+  }
 
   void Update() {
+    BluetoothSetDiscovering(true);
     UpdateBlueToothDeviceList();
 
-    Reset();
-
-    add_device_ = NULL;
-    toggle_bluetooth_ = NULL;
-
-    AppendDeviceList();
-    AppendSettingsEntries();
-    AppendHeaderEntry();
-
+    // Update UI.
+    UpdateDeviceScrollList();
+    UpdateHeaderEntry();
     Layout();
   }
 
  private:
+  void CreateItems() {
+    CreateScrollableList();
+    AppendSettingsEntries();
+    AppendHeaderEntry();
+  }
+
+  void BluetoothSetDiscovering(bool discovering) {
+    ash::SystemTrayDelegate* delegate =
+        ash::Shell::GetInstance()->system_tray_delegate();
+    if (discovering) {
+      bool bluetooth_enabled = delegate->GetBluetoothEnabled();
+      if (!bluetooth_discovering_ && bluetooth_enabled)
+        delegate->BluetoothSetDiscovering(true);
+      bluetooth_discovering_ = bluetooth_enabled;
+    } else {   // Stop bluetooth discovering.
+      if (bluetooth_discovering_) {
+        bluetooth_discovering_ = false;
+        delegate->BluetoothSetDiscovering(false);
+      }
+    }
+  }
+
   void UpdateBlueToothDeviceList() {
     connected_devices_.clear();
     paired_not_connected_devices_.clear();
+    discovered_not_paired_devices_.clear();
     BluetoothDeviceList list;
     Shell::GetInstance()->system_tray_delegate()->
         GetAvailableBluetoothDevices(&list);
     for (size_t i = 0; i < list.size(); ++i) {
       if (list[i].connected)
         connected_devices_.push_back(list[i]);
-      else
+      else if (list[i].paired)
         paired_not_connected_devices_.push_back(list[i]);
+      else if (list[i].visible)
+        discovered_not_paired_devices_.push_back(list[i]);
     }
   }
 
   void AppendHeaderEntry() {
     CreateSpecialRow(IDS_ASH_STATUS_TRAY_BLUETOOTH, this);
 
     if (login_ == user::LOGGED_IN_LOCKED)
       return;
 
     // Do not allow toggling bluetooth in the lock screen.
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->system_tray_delegate();
     toggle_bluetooth_ = new TrayPopupHeaderButton(this,
         IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED,
         IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED,
         IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER,
         IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER,
         IDS_ASH_STATUS_TRAY_BLUETOOTH);
     toggle_bluetooth_->SetToggled(!delegate->GetBluetoothEnabled());
     toggle_bluetooth_->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISABLE_BLUETOOTH));
     toggle_bluetooth_->SetToggledTooltipText(
         l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ENABLE_BLUETOOTH));
     footer()->AddButton(toggle_bluetooth_);
+ }
+
+  void UpdateHeaderEntry() {
+    if (toggle_bluetooth_) {
+      toggle_bluetooth_->SetToggled(
+          !ash::Shell::GetInstance()->system_tray_delegate()->
+              GetBluetoothEnabled());
+    }
   }
 
-  void AppendDeviceList() {
+  void UpdateDeviceScrollList() {
     device_map_.clear();
-    CreateScrollableList();
+    scroll_content()->RemoveAllChildViews(true);
+    enable_bluetooth_ = NULL;
 
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->system_tray_delegate();
     bool bluetooth_enabled = delegate->GetBluetoothEnabled();
-    if (delegate->GetBluetoothAvailable() && !bluetooth_enabled) {
+    bool blueooth_available = delegate->GetBluetoothAvailable();
+    if (blueooth_available && !bluetooth_enabled &&
+        toggle_bluetooth_) {
       enable_bluetooth_ =
           AddScrollListItem(
               l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ENABLE_BLUETOOTH),
               gfx::Font::NORMAL, false, true);
     }
 
     AppendSameTypeDevicesToScrollList(
         connected_devices_, true, true, bluetooth_enabled);
     AppendSameTypeDevicesToScrollList(
         paired_not_connected_devices_, false, false, bluetooth_enabled);
+    if (discovered_not_paired_devices_.size() > 0) {

[sadrul, 2013/01/07 20:39:03]

No braces needed

[jennyz, 2013/01/07 20:57:12]

Done.

+      AddScrollSeparator();
+    }
+    AppendSameTypeDevicesToScrollList(
+        discovered_not_paired_devices_, false, false, bluetooth_enabled);
 
     // Show user Bluetooth state if there is no bluetooth devices in list.
-    if (connected_devices_.size() == 0 &&
-        paired_not_connected_devices_.size() == 0) {
-      ash::SystemTrayDelegate* delegate =
-          ash::Shell::GetInstance()->system_tray_delegate();
-      int message_id;
-      if (delegate->GetBluetoothAvailable() &&
-          delegate->GetBluetoothEnabled()) {
-        if (delegate->IsBluetoothDiscovering())
-          message_id = IDS_ASH_STATUS_TRAY_BLUETOOTH_DISCOVERING;
-        else
-          message_id = IDS_ASH_STATUS_TRAY_BLUETOOTH_NO_DEVICE;
-        AddScrollListItem(l10n_util::GetStringUTF16(message_id),
-                          gfx::Font::NORMAL, false, true);
+    if (device_map_.size() == 0) {
+      if (blueooth_available && bluetooth_enabled) {
+        AddScrollListItem(
+            l10n_util::GetStringUTF16(
+                IDS_ASH_STATUS_TRAY_BLUETOOTH_DISCOVERING),
+            gfx::Font::NORMAL, false, true);
       }
     }
+
+    scroll_content()->SizeToPreferredSize();
+    static_cast<views::View*>(scroller())->Layout();
   }
 
   void AppendSameTypeDevicesToScrollList(const BluetoothDeviceList& list,
                                          bool bold,
                                          bool checked,
                                          bool enabled) {
     for (size_t i = 0; i < list.size(); ++i) {
       HoverHighlightView* container = AddScrollListItem(
           list[i].display_name,
           bold? gfx::Font::BOLD : gfx::Font::NORMAL,
@@ skipping 39 matching lines @@
   virtual void ClickedOn(views::View* sender) OVERRIDE {
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->system_tray_delegate();
     if (sender == footer()->content()) {
       owner()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
     } else if (sender == add_device_) {
       if (!delegate->GetBluetoothEnabled())
         delegate->ToggleBluetooth();
       delegate->AddBluetoothDevice();
     } else if (sender == enable_bluetooth_) {
-        delegate->ToggleBluetooth();
+      delegate->ToggleBluetooth();
     } else {
       std::map<views::View*, std::string>::iterator find;
       find = device_map_.find(sender);
       if (find != device_map_.end()) {
         std::string device_id = find->second;
         delegate->ToggleBluetoothConnection(device_id);
       }
     }
   }
 
   // Overridden from ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE {
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->system_tray_delegate();
     if (sender == toggle_bluetooth_)
       delegate->ToggleBluetooth();
     else
       NOTREACHED();
   }
 
   user::LoginStatus login_;
 
   std::map<views::View*, std::string> device_map_;
   views::View* add_device_;
   TrayPopupHeaderButton* toggle_bluetooth_;
   HoverHighlightView* enable_bluetooth_;
   BluetoothDeviceList connected_devices_;
   BluetoothDeviceList paired_not_connected_devices_;
+  BluetoothDeviceList discovered_not_paired_devices_;
+  bool bluetooth_discovering_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDetailedView);
 };
 
 }  // namespace tray
 
 TrayBluetooth::TrayBluetooth(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
       default_(NULL),
       detailed_(NULL) {
@@ skipping 44 matching lines @@
 }
 
 void TrayBluetooth::OnBluetoothDiscoveringChanged() {
   if (!detailed_)
     return;
   detailed_->Update();
 }
 
 }  // namespace internal
 }  // namespace ash