Index: chrome/browser/ui/gtk/gtk_util.cc |
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc |
index af090dcbe93508f720daebd40bbf6d9e0a27fd9d..cea5207230891e8a9ef1e95e3af91128c0c84def 100644 |
--- a/chrome/browser/ui/gtk/gtk_util.cc |
+++ b/chrome/browser/ui/gtk/gtk_util.cc |
@@ -52,13 +52,6 @@ |
#include "chrome/browser/ui/gtk/browser_window_gtk.h" |
#endif |
-using WebKit::WebDragOperationsMask; |
-using WebKit::WebDragOperation; |
-using WebKit::WebDragOperationNone; |
-using WebKit::WebDragOperationCopy; |
-using WebKit::WebDragOperationLink; |
-using WebKit::WebDragOperationMove; |
- |
namespace { |
#if defined(GOOGLE_CHROME_BUILD) |
@@ -508,11 +501,6 @@ GtkWidget* CenterWidgetInHBox(GtkWidget* hbox, GtkWidget* widget, |
return centering_vbox; |
} |
-bool IsScreenComposited() { |
- GdkScreen* screen = gdk_screen_get_default(); |
- return gdk_screen_is_composited(screen) == TRUE; |
-} |
- |
void EnumerateTopLevelWindows(ui::EnumerateWindowsDelegate* delegate) { |
std::vector<XID> stack; |
if (!ui::GetXWindowStack(ui::GetX11RootWindow(), &stack)) { |
@@ -720,19 +708,6 @@ void UpdateGtkFontSettings(RendererPreferences* prefs) { |
g_free(rgba_style); |
} |
-gfx::Point ScreenPoint(GtkWidget* widget) { |
- int x, y; |
- gdk_display_get_pointer(gtk_widget_get_display(widget), NULL, &x, &y, |
- NULL); |
- return gfx::Point(x, y); |
-} |
- |
-gfx::Point ClientPoint(GtkWidget* widget) { |
- int x, y; |
- gtk_widget_get_pointer(widget, &x, &y); |
- return gfx::Point(x, y); |
-} |
- |
GdkPoint MakeBidiGdkPoint(gint x, gint y, gint width, bool ltr) { |
GdkPoint point = {ltr ? x : width - x, y}; |
return point; |
@@ -1183,28 +1158,6 @@ void InitLabelSizeRequestAndEllipsizeMode(GtkWidget* label) { |
gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END); |
} |
-GdkDragAction WebDragOpToGdkDragAction(WebDragOperationsMask op) { |
- GdkDragAction action = static_cast<GdkDragAction>(0); |
- if (op & WebDragOperationCopy) |
- action = static_cast<GdkDragAction>(action | GDK_ACTION_COPY); |
- if (op & WebDragOperationLink) |
- action = static_cast<GdkDragAction>(action | GDK_ACTION_LINK); |
- if (op & WebDragOperationMove) |
- action = static_cast<GdkDragAction>(action | GDK_ACTION_MOVE); |
- return action; |
-} |
- |
-WebDragOperationsMask GdkDragActionToWebDragOp(GdkDragAction action) { |
- WebDragOperationsMask op = WebDragOperationNone; |
- if (action & GDK_ACTION_COPY) |
- op = static_cast<WebDragOperationsMask>(op | WebDragOperationCopy); |
- if (action & GDK_ACTION_LINK) |
- op = static_cast<WebDragOperationsMask>(op | WebDragOperationLink); |
- if (action & GDK_ACTION_MOVE) |
- op = static_cast<WebDragOperationsMask>(op | WebDragOperationMove); |
- return op; |
-} |
- |
void ApplyMessageDialogQuirks(GtkWidget* dialog) { |
if (gtk_window_get_modal(GTK_WINDOW(dialog))) { |
// Work around a KDE 3 window manager bug. |