Revert of mash: Close system tray bubble on click outside its bounds, part 1 (patchset #4 id:60001 …

ui/views/bubble/tray_bubble_view.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/tray_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 263 matching lines @@
                                        AnchorAlignment anchor_alignment,
                                        int min_width,
                                        int max_width)
     : anchor_type(anchor_type),
       anchor_alignment(anchor_alignment),
       min_width(min_width),
       max_width(max_width),
       max_height(0),
       can_activate(false),
       close_on_deactivate(true),
-      close_via_capture(false),
       arrow_color(SK_ColorBLACK),
       first_item_has_no_margin(false),
       arrow(BubbleBorder::NONE),
       arrow_offset(kArrowDefaultOffset),
       arrow_paint_type(BubbleBorder::PAINT_NORMAL),
       shadow(BubbleBorder::BIG_SHADOW),
-      arrow_alignment(BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE) {}
+      arrow_alignment(BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE) {
+}
 
 TrayBubbleView::InitParams::InitParams(const InitParams& other) = default;
 
 // static
 TrayBubbleView* TrayBubbleView::Create(gfx::NativeView parent_window,
                                        View* anchor,
                                        Delegate* delegate,
                                        InitParams* init_params) {
   // Set arrow here so that it can be passed to the BubbleView constructor.
   if (init_params->anchor_type == ANCHOR_TYPE_TRAY) {
@@ skipping 47 matching lines @@
   // Must occur after call to BubbleDelegateView::CreateBubble().
   SetAlignment(params_.arrow_alignment);
   bubble_border_->UpdateArrowOffset();
 
   layer()->parent()->SetMaskLayer(bubble_content_mask_->layer());
 
   GetWidget()->Show();
   GetWidget()->GetNativeWindow()->SetEventTargeter(
       std::unique_ptr<ui::EventTargeter>(new BubbleWindowTargeter(this)));
   UpdateBubble();
-
-  if (params_.close_via_capture) {
-    GetWidget()->set_auto_release_capture(false);
-    // Capture events to this view so it will be notified of capture loss.
-    GetWidget()->SetCapture(this);
-  }
 }
 
 void TrayBubbleView::UpdateBubble() {
   if (GetWidget()) {
     SizeToContents();
     bubble_content_mask_->layer()->SetBounds(layer()->bounds());
     GetWidget()->GetRootView()->SchedulePaint();
   }
 }
 
@@ skipping 72 matching lines @@
   for (int i = 0; i < child_count(); ++i) {
     const View* child = child_at(i);
     if (child->visible())
       height += child->GetHeightForWidth(width);
   }
 
   return (params_.max_height != 0) ?
       std::min(height, params_.max_height) : height;
 }
 
-void TrayBubbleView::OnMouseCaptureLost() {
-  if (params_.close_via_capture && delegate_) {
-    // Let the delegate destroy the bubble in case it needs to do cleanup.
-    delegate_->HideBubble(this);
-  }
-}
-
 void TrayBubbleView::OnMouseEntered(const ui::MouseEvent& event) {
   mouse_watcher_.reset();
   if (delegate_ && !(event.flags() & ui::EF_IS_SYNTHESIZED)) {
     // Coming here the user was actively moving the mouse over the bubble and
     // we inform the delegate that we entered. This will prevent the bubble
     // to auto close.
     delegate_->OnMouseEnteredView();
     mouse_actively_entered_ = true;
   } else {
     // Coming here the bubble got shown and the mouse was 'accidentally' over it
@@ skipping 14 matching lines @@
 
 void TrayBubbleView::OnMouseExited(const ui::MouseEvent& event) {
   // If there was a mouse watcher waiting for mouse movements we disable it
   // immediately since we now leave the bubble.
   mouse_watcher_.reset();
   // Do not notify the delegate of an exit if we never told it that we entered.
   if (delegate_ && mouse_actively_entered_)
     delegate_->OnMouseExitedView();
 }
 
-bool TrayBubbleView::OnMousePressed(const ui::MouseEvent& event) {
-  if (params_.close_via_capture && GetWidget()->HasCapture() &&
-      !bounds().Contains(event.location())) {
-    // Explicitly releasing capture will close the bubble.
-    GetWidget()->ReleaseCapture();
-    // Don't return that the event was handled because other views may want to
-    // handle it or the window server may want to repost it.
-  }
-  return views::BubbleDelegateView::OnMousePressed(event);
-}
-
 void TrayBubbleView::GetAccessibleState(ui::AXViewState* state) {
   if (delegate_ && params_.can_activate) {
     state->role = ui::AX_ROLE_WINDOW;
     state->name = delegate_->GetAccessibleNameForBubble();
   }
 }
 
 void TrayBubbleView::MouseMovedOutOfHost() {
   // The mouse was accidentally over the bubble when it opened and the AutoClose
   // logic was not activated. Now that the user did move the mouse we tell the
   // delegate to disable AutoClose.
   delegate_->OnMouseEnteredView();
   mouse_actively_entered_ = true;
   mouse_watcher_->Stop();
 }
 
 void TrayBubbleView::ChildPreferredSizeChanged(View* child) {
   SizeToContents();
 }
 
 void TrayBubbleView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this) {
     details.parent->SetPaintToLayer(true);
     details.parent->layer()->SetMasksToBounds(true);
   }
 }
 
 }  // namespace views