ash: New assets for uber-tray.

ash: New assets for uber-tray.

TBR=ben@chromium.org
BUG=127430
TEST=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=138222

[sadrul, 2012-05-22 05:59:24]

TBR'ing asset change CL

[Ben Goodger (Google), 2012-05-22 14:50:05]

LGTM

On Mon, May 21, 2012 at 10:59 PM, <sadrul@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Message:
> TBR'ing asset change CL
>
> Description:
> ash: New assets for uber-tray.
>
> TBR=ben@chromium.org
> BUG=127430
> TEST=none
>
> Committed: https://src.chromium.org/**viewvc/chrome?view=rev&**
>
revision=138222<https://src.chromium.org/viewvc/chrome?view=rev&revision=138222>
>
> Please review this at
http://codereview.chromium.**org/10414041/<http://codereview.chromium.org/104...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M ash/system/tray/tray_views.cc
>  A ui/resources/default_100_**percent/aura/status_bluetooth_**
> disabled_h.png
>  M ui/resources/default_100_**percent/aura/status_bluetooth_**enabled.png
>  A ui/resources/default_100_**percent/aura/status_bluetooth_**
> enabled_h.png
>  A ui/resources/default_100_**percent/aura/status_cellular_**
> disabled_h.png
>  M ui/resources/default_100_**percent/aura/status_cellular_**enabled.png
>  A ui/resources/default_100_**percent/aura/status_cellular_**enabled_h.png
>  M ui/resources/default_100_**percent/aura/status_help.png
>  A ui/resources/default_100_**percent/aura/status_help_h.png
>  M ui/resources/default_100_**percent/aura/status_**lockscreen.png
>  A ui/resources/default_100_**percent/aura/status_**lockscreen_h.png
>  M ui/resources/default_100_**percent/aura/status_network_**info.png
>  A + ui/resources/default_100_**percent/aura/status_network_**info_h.png
>  M ui/resources/default_100_**percent/aura/status_shutdown.**png
>  A ui/resources/default_100_**percent/aura/status_shutdown_**h.png
>  A ui/resources/default_100_**percent/aura/status_wifi_**disabled_h.png
>  M ui/resources/default_100_**percent/aura/status_wifi_**enabled.png
>  A ui/resources/default_100_**percent/aura/status_wifi_**enabled_h.png
>  M ui/resources/ui_resources.grd
>
>
> Index: ash/system/tray/tray_views.cc
> diff --git a/ash/system/tray/tray_views.**cc b/ash/system/tray/tray_views.
> **cc
> index 89a80ebe00cf3723000e92559b09cb**7252a0b9dc..**
> 6ce432fb472988b4e658ee3dc2dedc**91bcba75aa 100644
> --- a/ash/system/tray/tray_views.**cc
> +++ b/ash/system/tray/tray_views.**cc
> @@ -341,10 +341,6 @@ TrayPopupHeaderButton::**
> TrayPopupHeaderButton(views::**ButtonListener* listener,
>   SetImageAlignment(views::**ImageButton::ALIGN_CENTER,
>                     views::ImageButton::ALIGN_**MIDDLE);
>   set_focusable(true);
> -
> -  // TODO(sad): Turn animation back on once there are proper assets.
> -  // http://crbug.com/119832
> -  set_animate_on_state_change(**false);
>  }
>
>  TrayPopupHeaderButton::~**TrayPopupHeaderButton() {}
> Index: ui/resources/default_100_**percent/aura/status_bluetooth_**
> disabled_h.png
> diff --git
a/ui/resources/default_100_**percent/aura/status_bluetooth_**disabled_h.png
> b/ui/resources/default_100_**percent/aura/status_bluetooth_**
> disabled_h.png
> new file mode 100644
> index 000000000000000000000000000000**0000000000..**
> 5b1dc137348986f3c9d7239767b71b**b95005d65b
> Binary files /dev/null and b/ui/resources/default_100_**
> percent/aura/status_bluetooth_**disabled_h.png differ
> Index: ui/resources/default_100_**percent/aura/status_bluetooth_**
> enabled.png
> diff --git
a/ui/resources/default_100_**percent/aura/status_bluetooth_**enabled.png
> b/ui/resources/default_100_**percent/aura/status_bluetooth_**enabled.png
> index 04c481a90fb7a7562af2f8c940d98b**5df1ef222a..**
> a50c0c0bd6b6f2528b1bd488639e33**699a015348 100644
> Binary files
a/ui/resources/default_100_**percent/aura/status_bluetooth_**enabled.png
> and b/ui/resources/default_100_**percent/aura/status_bluetooth_**enabled.png
> differ
> Index: ui/resources/default_100_**percent/aura/status_bluetooth_**
> enabled_h.png
> diff --git
a/ui/resources/default_100_**percent/aura/status_bluetooth_**enabled_h.png
> b/ui/resources/default_100_**percent/aura/status_bluetooth_**enabled_h.png
> new file mode 100644
> index 000000000000000000000000000000**0000000000..**
> a2eb4a341b445082a745dd2f4eb1d3**c1508adb4a
> Binary files /dev/null and b/ui/resources/default_100_**
> percent/aura/status_bluetooth_**enabled_h.png differ
> Index: ui/resources/default_100_**percent/aura/status_cellular_**
> disabled_h.png
> diff --git
a/ui/resources/default_100_**percent/aura/status_cellular_**disabled_h.png
> b/ui/resources/default_100_**percent/aura/status_cellular_**disabled_h.png
> new file mode 100644
> index 000000000000000000000000000000**0000000000..**
> a2d94a04425e0f77ac59cb61534a07**f7262df3b2
> Binary files /dev/null and b/ui/resources/default_100_**
> percent/aura/status_cellular_**disabled_h.png differ
> Index: ui/resources/default_100_**percent/aura/status_cellular_**
> enabled.png
> diff --git
a/ui/resources/default_100_**percent/aura/status_cellular_**enabled.png
> b/ui/resources/default_100_**percent/aura/status_cellular_**enabled.png
> index 947d68ec08a9f8a81aad2d2715c7fa**f13ba437c9..**
> 02117b7a4f424f2605809425d84292**e53610a8f8 100644
> Binary files
a/ui/resources/default_100_**percent/aura/status_cellular_**enabled.png
> and b/ui/resources/default_100_**percent/aura/status_cellular_**enabled.png
> differ
> Index: ui/resources/default_100_**percent/aura/status_cellular_**
> enabled_h.png
> diff --git
a/ui/resources/default_100_**percent/aura/status_cellular_**enabled_h.png
> b/ui/resources/default_100_**percent/aura/status_cellular_**enabled_h.png
> new file mode 100644
> index 000000000000000000000000000000**0000000000..**
> f2a24ae010672fc574a9ebd18c6c5e**8c8a0ee2fe
> Binary files /dev/null and b/ui/resources/default_100_**
> percent/aura/status_cellular_**enabled_h.png differ
> Index: ui/resources/default_100_**percent/aura/status_help.png
> diff --git a/ui/resources/default_100_**percent/aura/status_help.png
> b/ui/resources/default_100_**percent/aura/status_help.png
> index 5f24e7bc890e994e3f071d89599a46**43378b43d5..**
> 16a5c1a6ab3f0d7e6ff116a8a17d29**b07afc1066 100644
> Binary files a/ui/resources/default_100_**percent/aura/status_help.png
> and b/ui/resources/default_100_**percent/aura/status_help.png differ
> Index: ui/resources/default_100_**percent/aura/status_help_h.png
> diff --git a/ui/resources/default_100_**percent/aura/status_help_h.png
> b/ui/resources/default_100_**percent/aura/status_help_h.png
> new file mode 100644
> index 000000000000000000000000000000**0000000000..**
> 6da728adf9522912235939f4a17f24**25159f52d5
> Binary files /dev/null and
b/ui/resources/default_100_**percent/aura/status_help_h.png
> differ
> Index: ui/resources/default_100_**percent/aura/status_**lockscreen.png
> diff --git a/ui/resources/default_100_**percent/aura/status_**lockscreen.png
> b/ui/resources/default_100_**percent/aura/status_**lockscreen.png
> index 12f085ebf70d4654f3a2b5d97c6c8b**590ee5b9ff..**
> 873c5089119efa0e1640a837dbf727**697230a7b8 100644
> Binary files
a/ui/resources/default_100_**percent/aura/status_**lockscreen.png
> and b/ui/resources/default_100_**percent/aura/status_**lockscreen.png
> differ
> Index: ui/resources/default_100_**percent/aura/status_**lockscreen_h.png
> diff --git
a/ui/resources/default_100_**percent/aura/status_**lockscreen_h.png
> b/ui/resources/default_100_**percent/aura/status_**lockscreen_h.png
> new file mode 100644
> index 000000000000000000000000000000**0000000000..**
> 5605acc2bca7fbad5186ac92b59eb2**e840ade2e9
> Binary files /dev/null and b/ui/resources/default_100_**
> percent/aura/status_**lockscreen_h.png differ
> Index: ui/resources/default_100_**percent/aura/status_network_**info.png
> diff --git
a/ui/resources/default_100_**percent/aura/status_network_**info.png
> b/ui/resources/default_100_**percent/aura/status_network_**info.png
> index 28c629f4355bf48624651a397f9d7a**5bb6915d8a..**
> 6914f6d807297fabdc2273dbfcd3b5**987ed46bb5 100644
> Binary files
a/ui/resources/default_100_**percent/aura/status_network_**info.png
> and b/ui/resources/default_100_**percent/aura/status_network_**info.png
> differ
> Index: ui/resources/default_100_**percent/aura/status_network_**info_h.png
> diff --git
a/ui/resources/default_100_**percent/aura/status_network_**info.png
> b/ui/resources/default_100_**percent/aura/status_network_**info_h.png
> similarity index 100%
> copy from ui/resources/default_100_**percent/aura/status_network_**
> info.png
> copy to ui/resources/default_100_**percent/aura/status_network_**
> info_h.png
> Index: ui/resources/default_100_**percent/aura/status_shutdown.**png
> diff --git a/ui/resources/default_100_**percent/aura/status_shutdown.**png
> b/ui/resources/default_100_**percent/aura/status_shutdown.**png
> index 75f89428eb0f24198933e558c3069c**707005ee53..**
> af3537634ba39e6cc49e6870026e5b**e01e488cf0 100644
> Binary files a/ui/resources/default_100_**percent/aura/status_shutdown.**png
> and b/ui/resources/default_100_**percent/aura/status_shutdown.**png differ
> Index: ui/resources/default_100_**percent/aura/status_shutdown_**h.png
> diff --git a/ui/resources/default_100_**percent/aura/status_shutdown_**h.png
> b/ui/resources/default_100_**percent/aura/status_shutdown_**h.png
> new file mode 100644
> index 000000000000000000000000000000**0000000000..**
> c92924f4fec19910dde4d0544c1358**d3c98d8d2a
> Binary files /dev/null and b/ui/resources/default_100_**
> percent/aura/status_shutdown_**h.png differ
> Index: ui/resources/default_100_**percent/aura/status_wifi_**
> disabled_h.png
> diff --git
a/ui/resources/default_100_**percent/aura/status_wifi_**disabled_h.png
> b/ui/resources/default_100_**percent/aura/status_wifi_**disabled_h.png
> new file mode 100644
> index 000000000000000000000000000000**0000000000..**
> 029a34f12e3edded05d89c40e33ed1**26934aaae7
> Binary files /dev/null and b/ui/resources/default_100_**
> percent/aura/status_wifi_**disabled_h.png differ
> Index: ui/resources/default_100_**percent/aura/status_wifi_**enabled.png
> diff --git
a/ui/resources/default_100_**percent/aura/status_wifi_**enabled.png
> b/ui/resources/default_100_**percent/aura/status_wifi_**enabled.png
> index f29232dc021955df63abe18ddbd12d**531cfc300b..**
> c8a4cfa06efcbbae55bfbe24df56d8**75e55d5535 100644
> Binary files
a/ui/resources/default_100_**percent/aura/status_wifi_**enabled.png
> and b/ui/resources/default_100_**percent/aura/status_wifi_**enabled.png
> differ
> Index: ui/resources/default_100_**percent/aura/status_wifi_**enabled_h.png
> diff --git
a/ui/resources/default_100_**percent/aura/status_wifi_**enabled_h.png
> b/ui/resources/default_100_**percent/aura/status_wifi_**enabled_h.png
> new file mode 100644
> index 000000000000000000000000000000**0000000000..**
> 3736329a7e723ac491e1470f8a184c**c60c45d9ca
> Binary files /dev/null and b/ui/resources/default_100_**
> percent/aura/status_wifi_**enabled_h.png differ
> Index: ui/resources/ui_resources.grd
> diff --git a/ui/resources/ui_resources.**grd b/ui/resources/ui_resources.*
> *grd
> index 87d45061a363425b8b3077a335ecd9**ed3aabe976..**
> ec29cebbc2eec572b838abf85c45bd**8e28194804 100644
> --- a/ui/resources/ui_resources.**grd
> +++ b/ui/resources/ui_resources.**grd
> @@ -288,7 +288,7 @@
>         <include name="IDR_AURA_UBER_TRAY_**POWER_SMALL_DARK"
> file="default_100_percent/**aura/status_power_small_all_**dark.png"
> type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_**NETWORK_AIRPLANE"
> file="default_100_percent/**aura/status_network_airplane.**png"
> type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_**NETWORK_INFO"
> file="default_100_percent/**aura/status_network_info.png" type="BINDATA"
> />
> -        <include name="IDR_AURA_UBER_TRAY_**NETWORK_INFO_HOVER"
> file="oak.png" type="BINDATA" />
> +        <include name="IDR_AURA_UBER_TRAY_**NETWORK_INFO_HOVER"
> file="default_100_percent/**aura/status_network_info_h.**png"
> type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/*
> *aura/status_sms.png" type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_MORE" file="default_100_percent/
> **aura/status_more.png" type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_LESS" file="default_100_percent/
> **aura/status_less.png" type="BINDATA" />
> @@ -306,23 +306,23 @@
>         <include name="IDR_AURA_UBER_TRAY_**UPDATE"
> file="default_100_percent/**aura/status_update.png" type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_**UPDATE_DARK"
> file="default_100_percent/**aura/status_update_dark.png" type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_WIFI_**ENABLED"
> file="default_100_percent/**aura/status_wifi_enabled.png" type="BINDATA"
> />
> -        <include name="IDR_AURA_UBER_TRAY_WIFI_**ENABLED_HOVER"
> file="oak.png" type="BINDATA" />
> +        <include name="IDR_AURA_UBER_TRAY_WIFI_**ENABLED_HOVER"
> file="default_100_percent/**aura/status_wifi_enabled_h.**png"
> type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_WIFI_**DISABLED"
> file="default_100_percent/**aura/status_wifi_disabled.png" type="BINDATA"
> />
> -        <include name="IDR_AURA_UBER_TRAY_WIFI_**DISABLED_HOVER"
> file="oak.png" type="BINDATA" />
> +        <include name="IDR_AURA_UBER_TRAY_WIFI_**DISABLED_HOVER"
> file="default_100_percent/**aura/status_wifi_disabled_h.**png"
> type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_**CELLULAR_ENABLED"
> file="default_100_percent/**aura/status_cellular_enabled.**png"
> type="BINDATA" />
> -        <include name="IDR_AURA_UBER_TRAY_**CELLULAR_ENABLED_HOVER"
> file="oak.png" type="BINDATA" />
> +        <include name="IDR_AURA_UBER_TRAY_**CELLULAR_ENABLED_HOVER"
> file="default_100_percent/**aura/status_cellular_enabled_**h.png"
> type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_**CELLULAR_DISABLED"
> file="default_100_percent/**aura/status_cellular_disabled.**png"
> type="BINDATA" />
> -        <include name="IDR_AURA_UBER_TRAY_**CELLULAR_DISABLED_HOVER"
> file="oak.png" type="BINDATA" />
> +        <include name="IDR_AURA_UBER_TRAY_**CELLULAR_DISABLED_HOVER"
> file="default_100_percent/**aura/status_cellular_disabled_**h.png"
> type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_**BLUETOOTH_ENABLED"
> file="default_100_percent/**aura/status_bluetooth_enabled.**png"
> type="BINDATA" />
> -        <include name="IDR_AURA_UBER_TRAY_**BLUETOOTH_ENABLED_HOVER"
> file="oak.png" type="BINDATA" />
> +        <include name="IDR_AURA_UBER_TRAY_**BLUETOOTH_ENABLED_HOVER"
> file="default_100_percent/**aura/status_bluetooth_enabled_**h.png"
> type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_**BLUETOOTH_DISABLED"
> file="default_100_percent/**aura/status_bluetooth_**disabled.png"
> type="BINDATA" />
> -        <include name="IDR_AURA_UBER_TRAY_**BLUETOOTH_DISABLED_HOVER"
> file="oak.png" type="BINDATA" />
> +        <include name="IDR_AURA_UBER_TRAY_**BLUETOOTH_DISABLED_HOVER"
> file="default_100_percent/**aura/status_bluetooth_**disabled_h.png"
> type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_**SHUTDOWN"
> file="default_100_percent/**aura/status_shutdown.png" type="BINDATA" />
> -        <include name="IDR_AURA_UBER_TRAY_**SHUTDOWN_HOVER"
> file="oak.png" type="BINDATA" />
> +        <include name="IDR_AURA_UBER_TRAY_**SHUTDOWN_HOVER"
> file="default_100_percent/**aura/status_shutdown_h.png" type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_**LOCKSCREEN"
> file="default_100_percent/**aura/status_lockscreen.png" type="BINDATA" />
> -        <include name="IDR_AURA_UBER_TRAY_**LOCKSCREEN_HOVER"
> file="oak.png" type="BINDATA" />
> +        <include name="IDR_AURA_UBER_TRAY_**LOCKSCREEN_HOVER"
> file="default_100_percent/**aura/status_lockscreen_h.png" type="BINDATA"
> />
>         <include name="IDR_AURA_UBER_TRAY_HELP" file="default_100_percent/
> **aura/status_help.png" type="BINDATA" />
> -        <include name="IDR_AURA_UBER_TRAY_HELP_**HOVER" file="oak.png"
> type="BINDATA" />
> +        <include name="IDR_AURA_UBER_TRAY_HELP_**HOVER"
> file="default_100_percent/**aura/status_help_h.png" type="BINDATA" />
>         <include name="IDR_AURA_UBER_TRAY_**LOCALE"
> file="default_100_percent/**aura/status_locale.png" type="BINDATA" />
>
>         <include name="IDR_AURA_SWITCH_MONITOR" file="default_100_percent/
> **aura/switch_monitor.png" type="BINDATA" />
>
>
>