Sound volume and bightness bubbles doesn't grab focus anymore.

chrome/browser/ui/views/bubble/bubble.cc

 // Copyright (c) 2011 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/ui/views/bubble/bubble.h"
 
 #include <vector>
 
 #include "chrome/browser/ui/views/bubble/border_contents.h"
 #include "content/common/notification_service.h"
@@ skipping 37 matching lines @@
 
 // static
 Bubble* Bubble::Show(views::Widget* parent,
                      const gfx::Rect& position_relative_to,
                      BubbleBorder::ArrowLocation arrow_location,
                      views::View* contents,
                      BubbleDelegate* delegate) {
   Bubble* bubble = new Bubble;
   bubble->InitBubble(parent, position_relative_to, arrow_location,
                      contents, delegate);
+
+  // Register the Escape accelerator for closing.
+  bubble->RegisterEscapeAccelerator();
+
   return bubble;
 }
 
 #if defined(OS_CHROMEOS)
 // static
 Bubble* Bubble::ShowFocusless(
     views::Widget* parent,
     const gfx::Rect& position_relative_to,
     BubbleBorder::ArrowLocation arrow_location,
     views::View* contents,
@@ skipping 64 matching lines @@
       delegate_(NULL),
       show_status_(kOpen),
       fade_away_on_close_(false),
 #if defined(TOOLKIT_USES_GTK)
       type_(views::Widget::InitParams::TYPE_WINDOW_FRAMELESS),
 #endif
 #if defined(OS_CHROMEOS)
       show_while_screen_is_locked_(false),
 #endif
       arrow_location_(BubbleBorder::NONE),
-      contents_(NULL) {
+      contents_(NULL),
+      accelerator_registered_(false) {
 }
 
 #if defined(OS_CHROMEOS)
 Bubble::Bubble(views::Widget::InitParams::Type type,
                bool show_while_screen_is_locked)
     : views::NativeWidgetGtk(new views::Widget),
       border_contents_(NULL),
       delegate_(NULL),
       show_status_(kOpen),
       fade_away_on_close_(false),
@@ skipping 107 matching lines @@
   contents_view->AddChildViewAt(border_contents_, 0);
 
   // |contents_view| has no layout manager, so we have to explicitly position
   // its children.
   border_contents_->SetBoundsRect(
       gfx::Rect(gfx::Point(), window_bounds.size()));
   contents->SetBoundsRect(contents_bounds);
 #endif
   GetWidget()->SetBounds(window_bounds);
 
-  // Register the Escape accelerator for closing.
-  GetWidget()->GetFocusManager()->RegisterAccelerator(
-      views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
-
   // Done creating the bubble.
   NotificationService::current()->Notify(NotificationType::INFO_BUBBLE_CREATED,
                                          Source<Bubble>(this),
                                          NotificationService::NoDetails());
 
   // Show the window.
 #if defined(OS_WIN)
   border_->ShowWindow(SW_SHOW);
   ShowWindow(SW_SHOW);
   if (fade_in)
     FadeIn();
 #elif defined(TOOLKIT_USES_GTK)
   GetWidget()->Show();
 #endif
 }
 
+void Bubble::RegisterEscapeAccelerator() {
+  GetWidget()->GetFocusManager()->RegisterAccelerator(
+      views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
+  accelerator_registered_ = true;
+}
+
+void Bubble::UnregisterEscapeAccelerator() {
+  DCHECK(accelerator_registered_);
+  GetWidget()->GetFocusManager()->UnregisterAccelerator(
+      views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
+  accelerator_registered_ = false;
+}
+
 BorderContents* Bubble::CreateBorderContents() {
   return new BorderContents();
 }
 
 void Bubble::SizeToContents() {
   gfx::Rect window_bounds;
 
 #if defined(OS_WIN)
   // Initialize and position the border window.
   window_bounds = border_->SizeAndGetBounds(position_relative_to_,
@@ skipping 27 matching lines @@
 void Bubble::IsActiveChanged() {
   if (!GetWidget()->IsActive())
     GetWidget()->Close();
 }
 #endif
 
 void Bubble::DoClose(bool closed_by_escape) {
   if (show_status_ == kClosed)
     return;
 
-  GetWidget()->GetFocusManager()->UnregisterAccelerator(
-      views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
+  if (accelerator_registered_)
+    UnregisterEscapeAccelerator();
   if (delegate_)
     delegate_->BubbleClosing(this, closed_by_escape);
   show_status_ = kClosed;
 #if defined(OS_WIN)
   border_->Close();
 #endif
 #if defined(OS_WIN)
   NativeWidgetWin::Close();
 #elif defined(TOOLKIT_USES_GTK)
   NativeWidgetGtk::Close();
@@ skipping 30 matching lines @@
     animation_->Hide();
 }
 
 bool Bubble::AcceleratorPressed(const views::Accelerator& accelerator) {
   if (!delegate_ || delegate_->CloseOnEscape()) {
     DoClose(true);
     return true;
   }
   return false;
 }