zoom bubble: Close if anchor is clicked while bubble is showing.

chrome/browser/ui/views/location_bar/zoom_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 "chrome/browser/ui/views/location_bar/zoom_view.h"
 
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/gfx/size.h"
 
 ZoomView::ZoomView(LocationBarView::Delegate* location_bar_delegate)
-    : location_bar_delegate_(location_bar_delegate) {
+    : location_bar_delegate_(location_bar_delegate),
+      was_bubble_showing_(false) {
   SetAccessibilityFocusable(true);
   Update(NULL);
 }
 
 ZoomView::~ZoomView() {
 }
 
 void ZoomView::Update(ZoomController* zoom_controller) {
   if (!zoom_controller || zoom_controller->IsAtDefaultZoom() ||
       location_bar_delegate_->GetToolbarModel()->input_in_progress()) {
@@ skipping 14 matching lines @@
   state->role = ui::AX_ROLE_BUTTON;
 }
 
 bool ZoomView::GetTooltipText(const gfx::Point& p,
                               base::string16* tooltip) const {
   // Don't show tooltip if the zoom bubble is displayed.
   return !ZoomBubbleView::IsShowing() && ImageView::GetTooltipText(p, tooltip);
 }
 
 bool ZoomView::OnMousePressed(const ui::MouseEvent& event) {
+  // The Zoom bubble has its own widget. By the time this code is reached, it's
+  // already lost activation and is closing as mouse presses on other widgets
+  // immediately call Close().
+  was_bubble_showing_ = ZoomBubbleView::IsClosing();
+
   // Do nothing until mouse is released.
   return true;
 }
 
 void ZoomView::OnMouseReleased(const ui::MouseEvent& event) {
+ if (was_bubble_showing_) {
+   was_bubble_showing_ = false;
+   return;
+ }
+
   if (event.IsOnlyLeftMouseButton() && HitTestPoint(event.location()))
-    ActivateBubble();
+    ToggleBubble();
 }
 
 bool ZoomView::OnKeyPressed(const ui::KeyEvent& event) {
   if (event.key_code() != ui::VKEY_SPACE &&
       event.key_code() != ui::VKEY_RETURN) {
     return false;
   }
 
-  ActivateBubble();
+  ToggleBubble();
   return true;
 }
 
 void ZoomView::OnGestureEvent(ui::GestureEvent* event) {
   if (event->type() == ui::ET_GESTURE_TAP) {
-    ActivateBubble();
+    ToggleBubble();
     event->SetHandled();
   }
 }
 
-void ZoomView::ActivateBubble() {
-  ZoomBubbleView::ShowBubble(location_bar_delegate_->GetWebContents(), false);
+void ZoomView::ToggleBubble() {
+  if (ZoomBubbleView::IsShowing())
+    ZoomBubbleView::CloseBubble();
+  else
+    ZoomBubbleView::ShowBubble(location_bar_delegate_->GetWebContents(), false);
 }