diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 02:15:09 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 02:15:09 +0000 |
| commit | be1b155c7605c8b0fd53350cd4d954e5d1ae80b1 (patch) | |
| tree | 48840e26d720d787f24db9eb97cf342a7852a8e5 | |
| parent | e80c8364fcd38ae4a76b88911aae85e2ecbe3a89 (diff) | |
| download | chromium_src-be1b155c7605c8b0fd53350cd4d954e5d1ae80b1.zip chromium_src-be1b155c7605c8b0fd53350cd4d954e5d1ae80b1.tar.gz chromium_src-be1b155c7605c8b0fd53350cd4d954e5d1ae80b1.tar.bz2 | |
Merge 144593 - Calls parent's OnFocus/OnBlur explicitly in LauncherButton.
These methods in LauncherButton were introduced by me and forgotten to
call methods of parent's class there, but actually they're used for accessibility too.
R=zork@chromium.org,davemoore@chromium.org
BUG=134393
TEST=manually done on lumpy
Review URL: https://chromiumcodereview.appspot.com/10667011
TBR=mukai@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10690035
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@144859 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/launcher/launcher_button.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc index 4f48218..7c41621 100644 --- a/ash/launcher/launcher_button.cc +++ b/ash/launcher/launcher_button.cc @@ -398,10 +398,12 @@ void LauncherButton::Layout() { void LauncherButton::OnFocus() { AddState(STATE_FOCUSED); + CustomButton::OnFocus(); } void LauncherButton::OnBlur() { ClearState(STATE_FOCUSED); + CustomButton::OnBlur(); } void LauncherButton::Init() { |