gtk: Extract event functions into event_utils module.

chrome/browser/ui/gtk/gtk_util.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/gtk_util.h"
 
 #include <cairo/cairo.h>
 
 #include <algorithm>
 #include <cstdarg>
 #include <map>
 
 #include "base/environment.h"
 #include "base/i18n/rtl.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/browser_process.h"
-#include "chrome/browser/event_disposition.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
-#include "ui/base/events.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_screen_util.h"
 #include "ui/base/gtk/menu_label_accelerator_util.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/image/cairo_cached_surface.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/pango_util.h"
 
 // These conflict with base/tracked_objects.h, so need to come last.
 #include <gdk/gdkx.h>  // NOLINT
-#include <gtk/gtk.h>   // NOLINT
 
 using content::RenderWidgetHost;
 using content::WebContents;
 
 namespace {
 
 #if defined(GOOGLE_CHROME_BUILD)
 static const char* kIconName = "google-chrome";
 #else
 static const char* kIconName = "chromium-browser";
@@ skipping 223 matching lines @@
       window);
   return browser_window->browser()->GetActiveWebContents();
 }
 
 GtkWidget* GetBrowserWindowFocusedWidget(BrowserWindow* window) {
   return gtk_window_get_focus(window->GetNativeWindow());
 }
 
 }  // namespace
 
-namespace event_utils {
-
-// 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_MOUSE_BUTTON : 0;
-  flags |= (state & GDK_BUTTON2_MASK) ? ui::EF_MIDDLE_MOUSE_BUTTON : 0;
-  flags |= (state & GDK_BUTTON3_MASK) ? ui::EF_RIGHT_MOUSE_BUTTON : 0;
-  return flags;
-}
-
-}  // namespace event_utils
-
 namespace gtk_util {
 
 GtkWidget* CreateLabeledControlsGroup(std::vector<GtkWidget*>* labels,
                                       const char* text, ...) {
   va_list ap;
   va_start(ap, text);
   GtkWidget* table = gtk_table_new(0, 2, FALSE);
   gtk_table_set_col_spacing(GTK_TABLE(table), 0, ui::kLabelSpacing);
   gtk_table_set_row_spacings(GTK_TABLE(table), ui::kControlSpacing);
 
@@ skipping 593 matching lines @@
   GtkAllocation allocation;
   gtk_widget_get_allocation(widget, &allocation);
   return gfx::Rect(x, y, allocation.width, allocation.height);
 }
 
 void SuppressDefaultPainting(GtkWidget* container) {
   g_signal_connect(container, "expose-event",
                    G_CALLBACK(PaintNoBackground), NULL);
 }
 
-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::DispositionFromGdkState(state);
-}
-
 bool GrabAllInput(GtkWidget* widget) {
   guint time = gtk_get_current_event_time();
 
   if (!gtk_widget_get_visible(widget))
     return false;
 
   GdkWindow* gdk_window = gtk_widget_get_window(widget);
   if (!gdk_pointer_grab(gdk_window,
                         TRUE,
                         GdkEventMask(GDK_BUTTON_PRESS_MASK |
@@ skipping 216 matching lines @@
 
 void DoCopy(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderWidgetHost::Copy, "copy-clipboard");
 }
 
 void DoPaste(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderWidgetHost::Paste, "paste-clipboard");
 }
 
 }  // namespace gtk_util