diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 18:40:33 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 18:40:33 +0000 |
| commit | f55de7b96e97e1d6d2264c876ce55ac6ddd77c98 (patch) | |
| tree | a69e13bd4b17e742d854f4e5017a4aa1dafb6444 /ash/launcher | |
| parent | 852cc2746ddfa73bee6ae7d47e17afba6d95e0d0 (diff) | |
| download | chromium_src-f55de7b96e97e1d6d2264c876ce55ac6ddd77c98.zip chromium_src-f55de7b96e97e1d6d2264c876ce55ac6ddd77c98.tar.gz chromium_src-f55de7b96e97e1d6d2264c876ce55ac6ddd77c98.tar.bz2 | |
Update underline assets
BUG=156525
TEST=NONE
Review URL: https://codereview.chromium.org/11366008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/launcher_button.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc index eacd850..fd1839b 100644 --- a/ash/launcher/launcher_button.cc +++ b/ash/launcher/launcher_button.cc @@ -353,17 +353,17 @@ void LauncherButton::UpdateState() { } else { int bar_id; if (IsShelfHorizontal()) { - if (state_ & (STATE_HOVERED | STATE_FOCUSED | STATE_ATTENTION)) - bar_id = IDR_AURA_LAUNCHER_UNDERLINE_HOVER; - else if (state_ & STATE_ACTIVE) + if (state_ & STATE_ACTIVE) bar_id = IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE; + else if (state_ & (STATE_HOVERED | STATE_FOCUSED | STATE_ATTENTION)) + bar_id = IDR_AURA_LAUNCHER_UNDERLINE_HOVER; else bar_id = IDR_AURA_LAUNCHER_UNDERLINE_RUNNING; } else { - if (state_ & (STATE_HOVERED | STATE_FOCUSED | STATE_ATTENTION)) - bar_id = IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_HOVER; - else if (state_ & STATE_ACTIVE) + if (state_ & STATE_ACTIVE) bar_id = IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_ACTIVE; + else if (state_ & (STATE_HOVERED | STATE_FOCUSED | STATE_ATTENTION)) + bar_id = IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_HOVER; else bar_id = IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_RUNNING; } |