Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(788)

Unified Diff: chrome/browser/views/info_bubble.cc

Issue 2872004: accelerator removal fix in info bubble (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/screen_lock_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/info_bubble.cc
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index 274c4774147103cedb43423ed540f8fa5c618a6c..b57d6be9ab90179277806f521e44c51f4485c485 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -249,9 +249,6 @@ InfoBubble* InfoBubble::Show(views::Widget* parent,
}
void InfoBubble::Close() {
- GetFocusManager()->UnregisterAccelerator(
- views::Accelerator(base::VKEY_ESCAPE, false, false, false), this);
-
if (fade_away_on_close_)
FadeOut();
else
@@ -475,6 +472,8 @@ void InfoBubble::Close(bool closed_by_escape) {
if (closed_)
return;
+ GetFocusManager()->UnregisterAccelerator(
+ views::Accelerator(base::VKEY_ESCAPE, false, false, false), this);
if (delegate_)
delegate_->InfoBubbleClosing(this, closed_by_escape);
closed_ = true;
« no previous file with comments | « chrome/browser/chromeos/login/screen_lock_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698