From be1b155c7605c8b0fd53350cd4d954e5d1ae80b1 Mon Sep 17 00:00:00 2001 From: "mukai@chromium.org" Date: Fri, 29 Jun 2012 02:15:09 +0000 Subject: 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 --- ash/launcher/launcher_button.cc | 2 ++ 1 file changed, 2 insertions(+) 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() { -- cgit v1.1