Chromium Code Reviews| Index: chrome/browser/ui/views/location_bar/bubble_icon_view.cc |
| diff --git a/chrome/browser/ui/views/location_bar/bubble_icon_view.cc b/chrome/browser/ui/views/location_bar/bubble_icon_view.cc |
| index af515d320d5ea517e3bc3639431f55bf504f3858..5c56c59eabc0ef9742828e06161e43a0b8fa31d6 100644 |
| --- a/chrome/browser/ui/views/location_bar/bubble_icon_view.cc |
| +++ b/chrome/browser/ui/views/location_bar/bubble_icon_view.cc |
| @@ -29,8 +29,7 @@ BubbleIconView::BubbleIconView(CommandUpdater* command_updater, int command_id) |
| image_->SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY); |
| } |
| -BubbleIconView::~BubbleIconView() { |
| -} |
| +BubbleIconView::~BubbleIconView() {} |
| bool BubbleIconView::IsBubbleShowing() const { |
| // If the bubble is being destroyed, it's considered showing though it may be |
| @@ -86,16 +85,18 @@ void BubbleIconView::OnMouseReleased(const ui::MouseEvent& event) { |
| // doing nothing here. |
| if (suppress_mouse_released_action_) { |
| suppress_mouse_released_action_ = false; |
| + OnPressed(false); |
|
msw
2016/05/12 17:29:41
I think this might be double counting the deactiva
ftang
2016/05/12 18:38:08
line 99 will be hit only on mouse released but not
msw
2016/05/12 19:02:53
Acknowledged.
|
| return; |
| } |
| if (!event.IsLeftMouseButton()) |
| return; |
| const bool activated = HitTestPoint(event.location()); |
| - ink_drop_delegate_->OnAction( |
| - activated ? views::InkDropState::ACTIVATED : views::InkDropState::HIDDEN); |
| + ink_drop_delegate_->OnAction(activated ? views::InkDropState::ACTIVATED |
| + : views::InkDropState::HIDDEN); |
| if (activated) |
| ExecuteCommand(EXECUTE_SOURCE_MOUSE); |
| + OnPressed(activated); |
| } |
| bool BubbleIconView::OnKeyPressed(const ui::KeyEvent& event) { |