Close new bubbles on deactivate; disable rendering Chrome inactive.

views/bubble/bubble_delegate.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 "views/bubble/bubble_delegate.h"
 
 #include "ui/base/animation/slide_animation.h"
 #include "views/bubble/bubble_frame_view.h"
 #include "views/widget/widget.h"
 
@@ skipping 57 matching lines @@
     border_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   border_widget->Init(border_params);
   return border_widget;
 }
 #endif
 
 }  // namespace
 
 BubbleDelegateView::BubbleDelegateView()
     : close_on_esc_(true),
+      close_on_blur_(true),
       arrow_location_(BubbleBorder::TOP_LEFT),
       color_(SK_ColorWHITE),
       border_widget_(NULL) {
   set_background(views::Background::CreateSolidBackground(color_));
   AddAccelerator(Accelerator(ui::VKEY_ESCAPE, 0));
 }
 
 BubbleDelegateView::BubbleDelegateView(
     const gfx::Point& anchor_point,
     BubbleBorder::ArrowLocation arrow_location,
     const SkColor& color)
     : close_on_esc_(true),
+      close_on_blur_(true),
       anchor_point_(anchor_point),
       arrow_location_(arrow_location),
       color_(color),
       original_opacity_(255),
       border_widget_(NULL) {
   set_background(views::Background::CreateSolidBackground(color_));
   AddAccelerator(Accelerator(ui::VKEY_ESCAPE, 0));
 }
 
 BubbleDelegateView::~BubbleDelegateView() {
   if (border_widget_)
     border_widget_->Close();
+  WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(this);
 }
 
 // static
 Widget* BubbleDelegateView::CreateBubble(BubbleDelegateView* bubble_delegate,
                                          Widget* parent_widget) {
   bubble_delegate->Init();
   Widget* bubble_widget = CreateBubbleWidget(bubble_delegate, parent_widget);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   bubble_delegate->InitializeBorderWidget(parent_widget);
   bubble_widget->SetContentsView(bubble_delegate->GetContentsView());
   bubble_widget->SetBounds(bubble_delegate->GetBubbleClientBounds());
 #else
   bubble_widget->SetBounds(bubble_delegate->GetBubbleBounds());
 #endif
 
+  if (parent_widget && parent_widget->GetTopLevelWidget())
+    parent_widget->GetTopLevelWidget()->DisableInactiveRendering();
+  WidgetFocusManager::GetInstance()->AddFocusChangeListener(bubble_delegate);
   return bubble_widget;
 }
 
 View* BubbleDelegateView::GetInitiallyFocusedView() {
   return this;
 }
 
 View* BubbleDelegateView::GetContentsView() {
   return this;
 }
 
 NonClientFrameView* BubbleDelegateView::CreateNonClientFrameView() {
   return new BubbleFrameView(GetArrowLocation(),
                              GetPreferredSize(),
                              GetColor());
 }
 
+void BubbleDelegateView::NativeFocusWillChange(gfx::NativeView focused_before,
+                                               gfx::NativeView focused_now) {
+  if (close_on_blur()) {
+    gfx::NativeView native_view = GetWidget()->GetNativeView();
+    if (focused_before == native_view && focused_now != native_view) {

[Ben Goodger (Google), 2011/11/01 23:54:56]

I thought we just discussed doing this in an activation changed handler.

[msw, 2011/11/05 03:22:24]

Done.

I was lead astray by WidgetFocusChangeListener (distinct from
FocusChangeListener). This is "notified when the native focus is about to
change" (Widget::OnNativeFocus/OnNativeBlur).

+      WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(this);
+      GetWidget()->Close();
+    }
+  }
+}
+
 gfx::Point BubbleDelegateView::GetAnchorPoint() {
   return anchor_point_;
 }
 
 BubbleBorder::ArrowLocation BubbleDelegateView::GetArrowLocation() const {
   return arrow_location_;
 }
 
 SkColor BubbleDelegateView::GetColor() const {
   return color_;
@@ skipping 90 matching lines @@
 }
 
 gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
   gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
   client_bounds.Offset(border_widget_->GetWindowScreenBounds().origin());
   return client_bounds;
 }
 #endif
 
 }  // namespace views