Fix double click item activation in right pane of bookmark manager....

chrome/browser/gtk/bookmark_manager_gtk.cc

 // Copyright (c) 2009 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/gtk/bookmark_manager_gtk.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 287 matching lines @@
 }
 
 // BookmarkManagerGtk, private -------------------------------------------------
 
 BookmarkManagerGtk::BookmarkManagerGtk(Profile* profile)
     : profile_(profile),
       model_(profile->GetBookmarkModel()),
       organize_is_for_left_(true),
       search_factory_(this),
       select_file_dialog_(SelectFileDialog::Create(this)),
-      delaying_mousedown_(false) {
+      delaying_mousedown_(false),
+      sending_delayed_mousedown_(false) {
   InitWidgets();
   g_signal_connect(window_, "destroy",
                    G_CALLBACK(OnWindowDestroy), this);
 
   model_->AddObserver(this);
   if (model_->IsLoaded())
     Loaded(model_);
 
   gtk_widget_show_all(window_);
 }
@@ skipping 436 matching lines @@
     prefs->SetInteger(prefs::kBookmarkTablePathWidth,
                       gtk_tree_view_column_get_width(path_column_));
   } else {
     prefs->SetInteger(prefs::kBookmarkTableNameWidth1,
                       gtk_tree_view_column_get_width(title_column_));
     prefs->SetInteger(prefs::kBookmarkTableURLWidth1,
                       gtk_tree_view_column_get_width(url_column_));
   }
 }
 
+void BookmarkManagerGtk::SendDelayedMousedown() {
+  sending_delayed_mousedown_ = true;
+  gtk_propagate_event(right_tree_view_,
+                      reinterpret_cast<GdkEvent*>(&mousedown_event_));
+  sending_delayed_mousedown_ = false;
+  delaying_mousedown_ = false;
+}
+
 bool BookmarkManagerGtk::RecursiveFind(GtkTreeModel* model, GtkTreeIter* iter,
                                        int target) {
   GValue value = { 0, };
   bool left = model == GTK_TREE_MODEL(left_store_);
   if (left) {
     if (iter->stamp == 0)
       gtk_tree_model_get_iter_first(GTK_TREE_MODEL(left_store_), iter);
     gtk_tree_model_get_value(model, iter, bookmark_utils::ITEM_ID, &value);
   }
   else {
@@ skipping 317 matching lines @@
 // a group of selected rows, the click at the start of the drag will deselect
 // all rows except the one the cursor is over.
 //
 // We return TRUE for when we want to ignore events (i.e., stop the default
 // handler from handling them), and FALSE for when we want to continue
 // propagation.
 //
 // static
 gboolean BookmarkManagerGtk::OnRightTreeViewButtonPress(GtkWidget* tree_view,
     GdkEventButton* event, BookmarkManagerGtk* bm) {
-  // Always let the cached mousedown sent from OnTreeViewButtonRelease through.
-  if (bm->delaying_mousedown_)
+  // Always let cached mousedown events through.
+  if (bm->sending_delayed_mousedown_) {
     return FALSE;
+  }
 
   if (event->button != 1)
     return FALSE;
 
+  // If a user double clicks, we will get two button presses in a row without
+  // any intervening mouse up, hence we must flush delayed mousedowns here as
+  // well as in the button release handler.
+  if (bm->delaying_mousedown_) {
+    bm->SendDelayedMousedown();
+    return FALSE;
+  }
+
   GtkTreePath* path;
   gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tree_view),
                                 event->x, event->y, &path, NULL, NULL, NULL);
 
   if (path == NULL)
     return TRUE;
 
   if (gtk_tree_selection_path_is_selected(bm->right_selection(), path)) {
     bm->mousedown_event_ = *event;
     bm->delaying_mousedown_ = true;
@@ skipping 31 matching lines @@
 gboolean BookmarkManagerGtk::OnTreeViewButtonRelease(GtkWidget* tree_view,
     GdkEventButton* button, BookmarkManagerGtk* bm) {
 #if defined(TOOLKIT_GTK)
   if (button->button == 3)
     bm->organize_menu_->PopupAsContext(button->time);
 #else
   // Implement on GTK+views.
   NOTIMPLEMENTED();
 #endif
 
-  if (bm->delaying_mousedown_ && (tree_view == bm->right_tree_view_)) {
-    gtk_propagate_event(tree_view,
-                        reinterpret_cast<GdkEvent*>(&bm->mousedown_event_));
-    bm->delaying_mousedown_ = false;
-  }
+  if (bm->delaying_mousedown_ && (tree_view == bm->right_tree_view_))
+    bm->SendDelayedMousedown();
 
   return FALSE;
 }
 
 // static
 void BookmarkManagerGtk::OnImportItemActivated(GtkMenuItem* menuitem,
                                                BookmarkManagerGtk* bm) {
   SelectFileDialog::FileTypeInfo file_type_info;
   file_type_info.extensions.resize(1);
   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
@@ skipping 41 matching lines @@
   } else if (id == IDS_BOOKMARK_MANAGER_EXPORT_MENU) {
     if (g_browser_process->io_thread()) {
       bookmark_html_writer::WriteBookmarks(
           g_browser_process->io_thread()->message_loop(), model_,
           path.ToWStringHack());
     }
   } else {
     NOTREACHED();
   }
 }