WindowOpenDisposition should not be exposed in base and ui modules. (1) Gdk refactoring

chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc

 // Copyright (c) 2011 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/bookmarks/bookmark_menu_controller_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
+#include "chrome/browser/ui/views/event_utils.h"

[Elliot Glaysher, 2011/08/24 18:04:49]

Please move event_utils to a common location; this is a gtk file.

[shinyak (Google), 2011/08/25 05:54:10]

Done.
just removed this header file because it is not necessary.

 #include "content/browser/tab_contents/page_navigator.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/gtk_util.h"
 #include "webkit/glue/window_open_disposition.h"
 
 namespace {
@@ skipping 257 matching lines @@
     // Don't handle this message; it was a drag.
     ignore_button_release_ = false;
     return FALSE;
   }
 
   // Releasing either button 1 or 2 should trigger the bookmark.
   if (!gtk_menu_item_get_submenu(GTK_MENU_ITEM(sender))) {
     // The menu item is a link node.
     if (event->button == 1 || event->button == 2) {
       WindowOpenDisposition disposition =
-          event_utils::DispositionFromEventFlags(event->state);
+        event_utils::DispositionFromGdkState(event->state);
+
       NavigateToMenuItem(sender, disposition);
 
       // We need to manually dismiss the popup menu because we're overriding
       // button-release-event.
       gtk_menu_popdown(GTK_MENU(menu_));
       return TRUE;
     }
   } else {
     // The menu item is a folder node.
     if (event->button == 1) {
@@ skipping 56 matching lines @@
 }
 
 void BookmarkMenuController::OnMenuItemDragGet(
     GtkWidget* widget, GdkDragContext* context,
     GtkSelectionData* selection_data,
     guint target_type, guint time) {
   const BookmarkNode* node = bookmark_utils::BookmarkNodeForWidget(widget);
   bookmark_utils::WriteBookmarkToSelection(node, selection_data, target_type,
                                            profile_);
 }