Refactor BubbleDelegateView::use_focuseless()

chrome/browser/ui/views/location_bar/zoom_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 "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
 
 #include "base/i18n/rtl.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chrome_page_zoom.h"
@@ skipping 45 matching lines @@
   bool anchor_to_view = !is_fullscreen ||
       browser_view->immersive_mode_controller()->IsRevealed();
   views::View* anchor_view = anchor_to_view ?
       browser_view->GetLocationBarView()->zoom_view() : NULL;
 
   // Find the extension that initiated the zoom change, if any.
   ZoomController* zoom_controller =
       ZoomController::FromWebContents(web_contents);
   const extensions::Extension* extension = zoom_controller->last_extension();
 
   // If the bubble is already showing in this window, its |auto_close_| value

[msw, 2014/07/24 22:16:33]

If you update ZoomBubbleView::OnGestureEvent as I've suggested, you should be
able to remove the comment about |auto_close| here, the condition on line 72,
and rewrite the comment about |auto_close| on line 78 (to something about
recreating the bubble for whatever other cases need that).

[vasilii, 2014/07/25 15:27:43]

Done.

   // is equal to |auto_close|, and the zoom change was not initiated by an
   // extension, then the bubble can be reused and only the label text needs to
   // be updated.
   if (zoom_bubble_ &&
       zoom_bubble_->GetAnchorView() == anchor_view &&
       zoom_bubble_->auto_close_ == auto_close &&
       !extension) {
     zoom_bubble_->Refresh();
     return;
   }
@@ skipping 17 matching lines @@
   // If we do not have an anchor view, parent the bubble to the content area.
   if (!anchor_to_view)
     zoom_bubble_->set_parent_window(web_contents->GetTopLevelNativeWindow());
 
   views::BubbleDelegateView::CreateBubble(zoom_bubble_);
 
   // Adjust for fullscreen after creation as it relies on the content size.
   if (is_fullscreen)
     zoom_bubble_->AdjustForFullscreen(browser_view->GetBoundsInScreen());
 
-  if (zoom_bubble_->use_focusless())
+  if (auto_close)
     zoom_bubble_->GetWidget()->ShowInactive();
   else
     zoom_bubble_->GetWidget()->Show();
 }
 
 // static
 void ZoomBubbleView::CloseBubble() {
   if (zoom_bubble_)
     zoom_bubble_->Close();
 }
@@ skipping 17 matching lines @@
     FullscreenController* fullscreen_controller)
     : BubbleDelegateView(anchor_view, anchor_view ?
           views::BubbleBorder::TOP_RIGHT : views::BubbleBorder::NONE),
       image_button_(NULL),
       label_(NULL),
       web_contents_(web_contents),
       auto_close_(auto_close),
       immersive_mode_controller_(immersive_mode_controller) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(5, 0, 5, 0));
-  set_use_focusless(auto_close);
   set_notify_enter_exit_on_child(true);
 
   // Add observers to close the bubble if the fullscreen state or immersive
   // fullscreen revealed state changes.
   registrar_.Add(this,
                  chrome::NOTIFICATION_FULLSCREEN_CHANGED,
                  content::Source<FullscreenController>(fullscreen_controller));
   immersive_mode_controller_->AddObserver(this);
 }
 
@@ skipping 90 matching lines @@
 }
 
 void ZoomBubbleView::OnExtensionIconImageChanged(
     extensions::IconImage* /* image */) {
   image_button_->SetImage(views::Button::STATE_NORMAL,
                           &extension_info_.icon_image->image_skia());
   image_button_->SchedulePaint();
 }
 
 void ZoomBubbleView::OnMouseEntered(const ui::MouseEvent& event) {
-  set_use_focusless(false);
   StopTimer();
 }
 
 void ZoomBubbleView::OnMouseExited(const ui::MouseEvent& event) {
-  set_use_focusless(auto_close_);
   StartTimerIfNecessary();
 }
 
 void ZoomBubbleView::OnGestureEvent(ui::GestureEvent* event) {
   if (!zoom_bubble_ || !zoom_bubble_->auto_close_ ||
       event->type() != ui::ET_GESTURE_TAP) {
     return;
   }
 
   // If an auto-closing bubble was tapped, show a non-auto-closing bubble in

[msw, 2014/07/24 16:52:28]

This is the culprit, can this just call StopTimer like OnMouseEntered?

[msw, 2014/07/24 22:16:33]

Sounds like Dan tentatively agrees with my suggestion here.

[Dan Beam, 2014/07/24 23:24:51]

yes

[vasilii, 2014/07/25 15:27:43]

Done.

   // its place.
   ShowBubble(zoom_bubble_->web_contents_, false);
   event->SetHandled();
 }
 
 void ZoomBubbleView::ButtonPressed(views::Button* sender,
                                    const ui::Event& event) {
   if (sender == image_button_) {
     DCHECK(extension_info_.icon_image) << "Invalid button press.";
     Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
@@ skipping 80 matching lines @@
 void ZoomBubbleView::WindowClosing() {
   // |zoom_bubble_| can be a new bubble by this point (as Close(); doesn't
   // call this right away). Only set to NULL when it's this bubble.
   if (zoom_bubble_ == this)
     zoom_bubble_ = NULL;
 }
 
 ZoomBubbleView::ZoomBubbleExtensionInfo::ZoomBubbleExtensionInfo() {}
 
 ZoomBubbleView::ZoomBubbleExtensionInfo::~ZoomBubbleExtensionInfo() {}