diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 15:08:21 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 15:08:21 +0000 |
| commit | e22206c5ff30133913e3773a83fc67f24819d02b (patch) | |
| tree | 7ca3a7aa47753eeaa77972aa69d1a2a807b0c141 /ash/system/bluetooth | |
| parent | 61ab21a7cc04d00e258fc9caf491e12d6f0569f5 (diff) | |
| download | chromium_src-e22206c5ff30133913e3773a83fc67f24819d02b.zip chromium_src-e22206c5ff30133913e3773a83fc67f24819d02b.tar.gz chromium_src-e22206c5ff30133913e3773a83fc67f24819d02b.tar.bz2 | |
ash: Fix various UI issues.
* Show integer battery power.
* Hide the user name, since we can't yet get the full name of the user.
* Refresh profile pic/avatar immediately after it is changed.
* New assets
BUG=119623, 119596, 119573
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9839011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/bluetooth')
| -rw-r--r-- | ash/system/bluetooth/tray_bluetooth.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc index 7732e34..975895f 100644 --- a/ash/system/bluetooth/tray_bluetooth.cc +++ b/ash/system/bluetooth/tray_bluetooth.cc @@ -35,9 +35,9 @@ class BluetoothDefaultView : public TrayItemMore { kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingBetweenItems)); ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); - views::ImageView* icon = new views::ImageView; + views::ImageView* icon = new FixedSizedImageView(0, kTrayPopupItemHeight); icon->SetImage(bundle.GetImageNamed( - IDR_AURA_UBER_TRAY_BLUETOOTH_LARGE).ToSkBitmap()); + IDR_AURA_UBER_TRAY_BLUETOOTH).ToSkBitmap()); AddChildView(icon); label_ = new views::Label; @@ -177,7 +177,7 @@ class BluetoothDetailedView : public views::View, } // namespace tray TrayBluetooth::TrayBluetooth() - : TrayImageItem(IDR_AURA_UBER_TRAY_BLUETOOTH_SMALL) { + : TrayImageItem(IDR_AURA_UBER_TRAY_BLUETOOTH) { } TrayBluetooth::~TrayBluetooth() { |