accelerator removal fix in info bubble

chrome/browser/views/info_bubble.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/info_bubble.h"
 
 #include "base/keyboard_codes.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/canvas.h"
@@ skipping 231 matching lines @@
                              BubbleBorder::ArrowLocation arrow_location,
                              views::View* contents,
                              InfoBubbleDelegate* delegate) {
   InfoBubble* window = new InfoBubble;
   window->Init(parent, position_relative_to, arrow_location,
                contents, delegate);
   return window;
 }
 
 void InfoBubble::Close() {
-  GetFocusManager()->UnregisterAccelerator(
-      views::Accelerator(base::VKEY_ESCAPE, false, false, false), this);
-
   if (fade_away_on_close_)
     FadeOut();
   else
     Close(false);
 }
 
 void InfoBubble::AnimationEnded(const Animation* animation) {
   if (static_cast<int>(animation_->GetCurrentValue()) == 0) {
     // When fading out we just need to close the bubble at the end
     Close(false);
@@ skipping 203 matching lines @@
 void InfoBubble::IsActiveChanged() {
   if (!IsActive())
     Close();
 }
 #endif
 
 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;
 #if defined(OS_WIN)
   border_->Close();
   WidgetWin::Close();
 #elif defined(OS_LINUX)
   WidgetGtk::Close();
 #endif
 }
@@ skipping 28 matching lines @@
     animation_->Hide();
 }
 
 bool InfoBubble::AcceleratorPressed(const views::Accelerator& accelerator) {
   if (!delegate_ || delegate_->CloseOnEscape()) {
     Close(true);
     return true;
   }
   return false;
 }