From e9125d2d9dc3b8c99df4bcc0ce5e10c98f6fca51 Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Thu, 17 Jun 2010 20:51:30 +0000 Subject: Correctly remove accelerator when info bubble is closed. accelerator was not removed when it's closed by escape accelerator. This was causing crash in screen locker. Use "Resume" text for unlock button. Removed unnecessary TextButton dependency in screen_lock_view.h BUG=none TEST=lock screen using ctrl-alt-l, type wrong password and enter then hit escape twice. It will not crash. Review URL: http://codereview.chromium.org/2872004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50136 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/views/info_bubble.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'chrome/browser/views/info_bubble.cc') diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 5827521..11ba19b 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -254,9 +254,6 @@ void InfoBubble::Close() { show_status_ = kClosing; - GetFocusManager()->UnregisterAccelerator( - views::Accelerator(base::VKEY_ESCAPE, false, false, false), this); - if (fade_away_on_close_) FadeOut(); else @@ -478,6 +475,8 @@ void InfoBubble::DoClose(bool closed_by_escape) { if (show_status_ == kClosed) return; + GetFocusManager()->UnregisterAccelerator( + views::Accelerator(base::VKEY_ESCAPE, false, false, false), this); if (delegate_) delegate_->InfoBubbleClosing(this, closed_by_escape); show_status_ = kClosed; -- cgit v1.1