Introduce 'connecting' field to bluetooth device info for system tray

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/fixed_sized_scroll_view.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 110 matching lines @@
         ash::Shell::GetInstance()->system_tray_delegate();
     if (delegate && bluetooth_discovering_) {
       bluetooth_discovering_ = false;
       delegate->BluetoothStopDiscovering();
       throbber_->Stop();
     }
   }
 
   void UpdateBlueToothDeviceList() {
     connected_devices_.clear();
+    connecting_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)
+      if (list[i].connecting)
+        connecting_devices_.push_back(list[i]);
+      else if (list[i].connected)
         connected_devices_.push_back(list[i]);
       else if (list[i].paired)
         paired_not_connected_devices_.push_back(list[i]);
       else
         discovered_not_paired_devices_.push_back(list[i]);
     }
   }
 
   void AppendHeaderEntry() {
     CreateSpecialRow(IDS_ASH_STATUS_TRAY_BLUETOOTH, this);
@@ skipping 44 matching lines @@
         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(
+        connecting_devices_, true, false, bluetooth_enabled);
+    AppendSameTypeDevicesToScrollList(
         paired_not_connected_devices_, false, false, bluetooth_enabled);
     if (discovered_not_paired_devices_.size() > 0)
       AddScrollSeparator();
     AppendSameTypeDevicesToScrollList(
         discovered_not_paired_devices_, false, false, bluetooth_enabled);
 
     // Show user Bluetooth state if there is no bluetooth devices in list.
     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) {
+      string16 display_name = list[i].display_name;
+      if (list[i].connecting) {
+        display_name = l10n_util::GetStringFUTF16(
+            IDS_ASH_STATUS_TRAY_BLUETOOTH_CONNECTING, display_name);
+      }

[jennyz, 2013/04/10 16:15:37]

It's a little bit unclean to modify the display name here, can you change the
item's display_name when you push the item into connecting_devices_. after line
139?

[Jun Mukai, 2013/04/13 00:05:35]

Done.

       HoverHighlightView* container = AddScrollListItem(
-          list[i].display_name,
+          display_name,
           bold? gfx::Font::BOLD : gfx::Font::NORMAL,
           checked, enabled);
       device_map_[container] = list[i].address;
     }
   }
 
   HoverHighlightView* AddScrollListItem(const string16& text,
                                         gfx::Font::FontStyle style,
                                         bool checked,
                                         bool enabled) {
@@ skipping 38 matching lines @@
     return false;
   }
 
   // Updates UI of the clicked bluetooth device to show it is being connected
   // or disconnected if such an operation is going to be performed underway.
   void UpdateClickedDevice(std::string device_id, views::View* item_container) {
     string16 display_name;
     if (FoundDevice(device_id, connected_devices_, &display_name)) {
       display_name = l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_BLUETOOTH_DISCONNECTING, display_name);
-    } else if (FoundDevice(device_id, paired_not_connected_devices_,
+    } else if (FoundDevice(device_id, connecting_devices_, &display_name) ||

[Jun Mukai, 2013/04/13 00:05:35]

noticed this is not necessary. since connecting_devices_ already shows
'connecting...' message, no need to update the label.

+               FoundDevice(device_id, paired_not_connected_devices_,
                            &display_name)) {
       display_name = l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_BLUETOOTH_CONNECTING, display_name);
     }
     if (display_name.length() > 0) {
       item_container->RemoveAllChildViews(true);
       static_cast<HoverHighlightView*>(item_container)->
           AddCheckableLabel(display_name, gfx::Font::BOLD, false);
       scroll_content()->SizeToPreferredSize();
       static_cast<views::View*>(scroller())->Layout();
@@ skipping 35 matching lines @@
   }
 
   user::LoginStatus login_;
 
   std::map<views::View*, std::string> device_map_;
   views::View* add_device_;
   ThrobberView* throbber_;
   TrayPopupHeaderButton* toggle_bluetooth_;
   HoverHighlightView* enable_bluetooth_;
   BluetoothDeviceList connected_devices_;
+  BluetoothDeviceList connecting_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)
@@ skipping 48 matching lines @@
 }
 
 void TrayBluetooth::OnBluetoothDiscoveringChanged() {
   if (!detailed_)
     return;
   detailed_->Update();
 }
 
 }  // namespace internal
 }  // namespace ash