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

chrome/browser/ui/gtk/gtk_util.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/gtk_util.h"
 
 #include <cairo/cairo.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include <cstdarg>
 #include <map>
 
 #include "base/environment.h"
 #include "base/i18n/rtl.h"
 #include "base/linux_util.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
+#include "chrome/browser/event_disposition.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
+#include "chrome/browser/ui/views/event_utils.h"

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

views in gtk

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

Done.

 #include "content/browser/disposition_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/renderer_preferences.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/events.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/frame/browser_view.h"
 #include "chrome/browser/chromeos/native_dialog_window.h"
@@ skipping 140 matching lines @@
 GtkWidget* GetBrowserWindowFocusedWidget(BrowserWindow* window) {
   return gtk_window_get_focus(window->GetNativeHandle());
 }
 
 #endif
 
 }  // namespace
 
 namespace event_utils {
 
-WindowOpenDisposition DispositionFromEventFlags(guint event_flags) {
-  return disposition_utils::DispositionFromClick(
-      event_flags & GDK_BUTTON2_MASK,
-      event_flags & GDK_MOD1_MASK,
-      event_flags & GDK_CONTROL_MASK,
-      event_flags & GDK_META_MASK,
-      event_flags & GDK_SHIFT_MASK);
+// TODO(shinyak) This function will be removed after refactoring.
+WindowOpenDisposition DispositionFromGdkState(guint state) {
+  int event_flags = EventFlagsFromGdkState(state);
+  return browser::DispositionFromEventFlags(event_flags);
+}
+
+int EventFlagsFromGdkState(guint state) {
+  int flags = 0;
+  flags |= (state & GDK_LOCK_MASK) ? ui::EF_CAPS_LOCK_DOWN : 0;
+  flags |= (state & GDK_CONTROL_MASK) ? ui::EF_CONTROL_DOWN : 0;
+  flags |= (state & GDK_SHIFT_MASK) ? ui::EF_SHIFT_DOWN : 0;
+  flags |= (state & GDK_MOD1_MASK) ? ui::EF_ALT_DOWN : 0;
+  flags |= (state & GDK_BUTTON1_MASK) ? ui::EF_LEFT_BUTTON_DOWN : 0;
+  flags |= (state & GDK_BUTTON2_MASK) ? ui::EF_MIDDLE_BUTTON_DOWN : 0;
+  flags |= (state & GDK_BUTTON3_MASK) ? ui::EF_RIGHT_BUTTON_DOWN : 0;
+  return flags;
 }
 
 }  // namespace event_utils
 
 namespace gtk_util {
 
 const GdkColor kGdkWhite = GDK_COLOR_RGB(0xff, 0xff, 0xff);
 const GdkColor kGdkGray  = GDK_COLOR_RGB(0x7f, 0x7f, 0x7f);
 const GdkColor kGdkBlack = GDK_COLOR_RGB(0x00, 0x00, 0x00);
 const GdkColor kGdkGreen = GDK_COLOR_RGB(0x00, 0xff, 0x00);
@@ skipping 706 matching lines @@
 
 WindowOpenDisposition DispositionForCurrentButtonPressEvent() {
   GdkEvent* event = gtk_get_current_event();
   if (!event) {
     NOTREACHED();
     return NEW_FOREGROUND_TAB;
   }
 
   guint state = event->button.state;
   gdk_event_free(event);
-  return event_utils::DispositionFromEventFlags(state);
+  return event_utils::DispositionFromGdkState(state);
 }
 
 bool GrabAllInput(GtkWidget* widget) {
   guint time = gtk_get_current_event_time();
 
   if (!gtk_widget_get_visible(widget))
     return false;
 
   if (!gdk_pointer_grab(widget->window, TRUE,
                         GdkEventMask(GDK_BUTTON_PRESS_MASK |
@@ skipping 340 matching lines @@
 
 void DoCopy(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");
 }
 
 void DoPaste(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");
 }
 
 }  // namespace gtk_util