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

chrome/browser/ui/gtk/menu_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/menu_gtk.h"
 
 #include <map>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/gtk/gtk_custom_menu.h"
 #include "chrome/browser/ui/gtk/gtk_custom_menu_item.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/views/event_utils.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/accelerator_gtk.h"
 #include "ui/base/models/button_menu_item_model.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/gtk_util.h"
 #include "webkit/glue/window_open_disposition.h"
 
 bool MenuGtk::block_activation_ = false;
 
 namespace {
@@ skipping 672 matching lines @@
 
   *y = CalculateMenuYPosition(&screen_rect, &menu_req, NULL, *y);
 }
 
 void MenuGtk::ExecuteCommand(ui::MenuModel* model, int id) {
   if (delegate_)
     delegate_->CommandWillBeExecuted();
 
   GdkEvent* event = gtk_get_current_event();
   if (event && event->type == GDK_BUTTON_RELEASE) {
-    model->ActivatedAtWithDisposition(
-        id, event_utils::DispositionFromEventFlags(event->button.state));
+    WindowOpenDisposition disposition =
+      event_utils::DispositionFromGdkState(event->button.state);
+
+    model->ActivatedAtWithDisposition(id, disposition);
   } else {
     model->ActivatedAt(id);
   }
 
   if (event)
     gdk_event_free(event);
 }
 
 void MenuGtk::OnMenuShow(GtkWidget* widget) {
   model_->MenuWillShow();
@@ skipping 102 matching lines @@
       gtk_widget_hide(widget);
     }
 
     GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
     if (submenu) {
       gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo,
                             userdata);
     }
   }
 }