diff options
| author | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 20:29:13 +0000 |
|---|---|---|
| committer | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 20:29:13 +0000 |
| commit | 14e1a0997d5166cf93f92fd173594cb7bd68d4f9 (patch) | |
| tree | 60a0184ac94d60ac385d25bab86a6615cdbdc75e /ash/system/bluetooth | |
| parent | 30275cedc43837db75c1a2ef8f1c22989388f346 (diff) | |
| download | chromium_src-14e1a0997d5166cf93f92fd173594cb7bd68d4f9.zip chromium_src-14e1a0997d5166cf93f92fd173594cb7bd68d4f9.tar.gz chromium_src-14e1a0997d5166cf93f92fd173594cb7bd68d4f9.tar.bz2 | |
Add checkmark for conencted bluetooth devices.
BUG=146425, 157868
Review URL: https://chromiumcodereview.appspot.com/11313010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/bluetooth')
| -rw-r--r-- | ash/system/bluetooth/tray_bluetooth.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc index 9f46fa3..50df5aa 100644 --- a/ash/system/bluetooth/tray_bluetooth.cc +++ b/ash/system/bluetooth/tray_bluetooth.cc @@ -117,7 +117,8 @@ class BluetoothDetailedView : public TrayDetailsView, for (size_t i = 0; i < list.size(); i++) { HoverHighlightView* container = AddScrollListItem(list[i].display_name, - list[i].connected ? gfx::Font::BOLD : gfx::Font::NORMAL); + list[i].connected ? gfx::Font::BOLD : gfx::Font::NORMAL, + list[i].connected); device_map_[container] = list[i].address; } @@ -134,16 +135,17 @@ class BluetoothDetailedView : public TrayDetailsView, else message_id = IDS_ASH_STATUS_TRAY_BLUETOOTH_NO_DEVICE; AddScrollListItem(l10n_util::GetStringUTF16(message_id), - gfx::Font::NORMAL); + gfx::Font::NORMAL, false); } } } HoverHighlightView* AddScrollListItem(const string16& text, - gfx::Font::FontStyle style) { + gfx::Font::FontStyle style, + bool checked) { HoverHighlightView* container = new HoverHighlightView(this); container->set_fixed_height(kTrayPopupItemHeight); - container->AddLabel(text, style); + container->AddCheckableLabel(text, style, checked); scroll_content()->AddChildView(container); return container; } |