Revert 137059 - Better fix for closing uber tray when clicking on Desktop

ui/views/bubble/bubble_delegate.cc

 // Copyright (c) 2012 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 "ui/views/bubble/bubble_delegate.h"
 
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/widget/widget.h"
 
 // The duration of the fade animation in milliseconds.
 static const int kHideFadeDurationMS = 200;
 
 // The defaut margin between the content and the inside border, in pixels.
 static const int kDefaultMargin = 6;
 
 namespace views {
 
 namespace {
 
 // Create a widget to host the bubble.
 Widget* CreateBubbleWidget(BubbleDelegateView* bubble) {
   Widget* bubble_widget = new Widget();
   Widget::InitParams bubble_params(Widget::InitParams::TYPE_BUBBLE);
   bubble_params.delegate = bubble;
   bubble_params.transparent = true;
-  bubble_params.close_on_deactivate = bubble->close_on_deactivate();
   if (bubble->parent_window())
     bubble_params.parent = bubble->parent_window();
   else
     bubble_params.parent_widget = bubble->anchor_widget();
   if (bubble->use_focusless())
     bubble_params.can_activate = false;
 #if defined(OS_WIN) && !defined(USE_AURA)
   bubble_params.type = Widget::InitParams::TYPE_WINDOW_FRAMELESS;
   bubble_params.transparent = false;
 #endif
@@ skipping 167 matching lines @@
     if (anchor_widget() && anchor_widget()->GetTopLevelWidget())
       anchor_widget()->GetTopLevelWidget()->DisableInactiveRendering();
   } else {
     if (border_widget_)
       border_widget_->Hide();
     if (anchor_widget())
       anchor_widget()->RemoveObserver(this);
   }
 }
 
+void BubbleDelegateView::OnWidgetActivationChanged(Widget* widget,
+                                                   bool active) {
+  if (close_on_deactivate() && widget == GetWidget() && !active)
+    GetWidget()->Close();
+}
+
 void BubbleDelegateView::OnWidgetMoved(Widget* widget) {
   if (move_with_anchor() && anchor_widget() == widget)
     SizeToContents();
 }
 
 gfx::Rect BubbleDelegateView::GetAnchorRect() {
   return anchor_view() ? anchor_view()->GetScreenBounds() : gfx::Rect();
 }
 
 void BubbleDelegateView::Show() {
@@ skipping 100 matching lines @@
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
   gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
   client_bounds.Offset(border_widget_->GetWindowScreenBounds().origin());
   return client_bounds;
 }
 #endif
 
 }  // namespace views