diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 23:59:34 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 23:59:34 +0000 |
| commit | 901e217f74521c66261816cab88e7ff31e2f7f7c (patch) | |
| tree | 8833530e2e6be6a9aee31b94f636c8159e11fb2b /ash | |
| parent | 0da73a3d52bb2a59e848246367aa92ab887b9c73 (diff) | |
| download | chromium_src-901e217f74521c66261816cab88e7ff31e2f7f7c.zip chromium_src-901e217f74521c66261816cab88e7ff31e2f7f7c.tar.gz chromium_src-901e217f74521c66261816cab88e7ff31e2f7f7c.tar.bz2 | |
Use new cros spinner asset in ThrobberView.
BUG=172768
TBR=oshima
Review URL: https://codereview.chromium.org/12377058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/resources/ash_resources.grd | 3 | ||||
| -rw-r--r-- | ash/system/tray/tray_views.cc | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd index 07c4127..57b6a2d 100644 --- a/ash/resources/ash_resources.grd +++ b/ash/resources/ash_resources.grd @@ -76,6 +76,9 @@ <structure type="chrome_scaled_image" name="IDR_AURA_TRAY_POPUP_LABEL_BUTTON_HOVER_BACKGROUND" file="common/tray_popup_label_button_hover_background.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND" file="common/tray_popup_label_button_normal_background.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER" file="common/tray_popup_public_account_logout_button_border.png" /> + + <structure type="chrome_scaled_image" name="IDR_AURA_CROS_DEFAULT_THROBBER" file="cros/common/default_throbber.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="cros/status/status_accessibility_mode.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK" file="cros/status/status_accessibility_dark.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="cros/status/status_bluetooth.png" /> diff --git a/ash/system/tray/tray_views.cc b/ash/system/tray/tray_views.cc index 4b48276..22f0995 100644 --- a/ash/system/tray/tray_views.cc +++ b/ash/system/tray/tray_views.cc @@ -40,7 +40,7 @@ const int kTrayPopupLabelButtonPaddingHorizontal = 16; const int kTrayPopupLabelButtonPaddingVertical = 8; // Time in ms per throbber frame. -const int kThrobberFrameMs = 50; +const int kThrobberFrameMs = 30; // Duration for showing/hiding animation in milliseconds. const int kThrobberAnimationDurationMs = 200; @@ -381,6 +381,8 @@ bool SystemTrayThrobber::GetTooltipText(const gfx::Point& p, ThrobberView::ThrobberView() { throbber_ = new SystemTrayThrobber(kThrobberFrameMs); + throbber_->SetFrames(ui::ResourceBundle::GetSharedInstance().GetImageNamed( + IDR_AURA_CROS_DEFAULT_THROBBER).ToImageSkia()); throbber_->set_stop_delay_ms(kThrobberAnimationDurationMs); AddChildView(throbber_); |