[gtk] When mouse is inside of an auto-closing zoom bubble and the zoom is

chrome/browser/ui/gtk/zoom_bubble_gtk.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/gtk/zoom_bubble_gtk.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
@@ skipping 51 matching lines @@
 // static
 void ZoomBubbleGtk::Close() {
   if (g_bubble)
     g_bubble->CloseBubble();
 }
 
 ZoomBubbleGtk::ZoomBubbleGtk(GtkWidget* anchor,
                              TabContents* tab_contents,
                              bool auto_close)
     : auto_close_(auto_close),
+      mouse_inside_(false),
       tab_contents_(tab_contents) {
   GtkThemeService* theme_service =
       GtkThemeService::GetFrom(Profile::FromBrowserContext(
           tab_contents->web_contents()->GetBrowserContext()));
 
   event_box_ = gtk_event_box_new();
   GtkWidget* container = gtk_vbox_new(FALSE, 0);
   gtk_container_add(GTK_CONTAINER(event_box_), container);
 
   int zoom_percent = tab_contents->zoom_controller()->zoom_percent();
@@ skipping 67 matching lines @@
 
 void ZoomBubbleGtk::Refresh() {
   int zoom_percent = tab_contents_->zoom_controller()->zoom_percent();
   string16 text =
       l10n_util::GetStringFUTF16Int(IDS_TOOLTIP_ZOOM, zoom_percent);
   gtk_label_set_text(GTK_LABEL(g_bubble->label_), UTF16ToUTF8(text).c_str());
   StartTimerIfNecessary();
 }
 
 void ZoomBubbleGtk::StartTimerIfNecessary() {
-  if (auto_close_) {
+  if (auto_close_ && !mouse_inside_) {

[Evan Stade, 2012/09/11 08:28:56]

prefer

if (!auto_close_ || mouse_inside_)
  return;

[Dan Beam, 2012/09/11 16:33:41]

Done.

     if (timer_.IsRunning()) {
       timer_.Reset();
     } else {
       timer_.Start(
           FROM_HERE,
           base::TimeDelta::FromMilliseconds(kBubbleCloseDelay),
           this,
           &ZoomBubbleGtk::CloseBubble);
     }
   }
@@ skipping 18 matching lines @@
   double default_zoom_level = Profile::FromBrowserContext(
       tab_contents_->web_contents()->GetBrowserContext())->
           GetPrefs()->GetDouble(prefs::kDefaultZoomLevel);
   tab_contents_->web_contents()->GetRenderViewHost()->
       SetZoomLevel(default_zoom_level);
 }
 
 gboolean ZoomBubbleGtk::OnMouseEnter(GtkWidget* widget,
                                      GdkEventCrossing* event) {
   StopTimerIfNecessary();
+  mouse_inside_ = true;
   return FALSE;
 }
 
 gboolean ZoomBubbleGtk::OnMouseLeave(GtkWidget* widget,
                                      GdkEventCrossing* event) {
   StartTimerIfNecessary();
+  mouse_inside_ = false;

[Evan Stade, 2012/09/11 08:28:56]

wouldn't you need to put this before StartTimerIfNecessary?

[Dan Beam, 2012/09/11 16:33:41]

Done.

   return FALSE;
 }