summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/common.gypi5
-rw-r--r--chrome/browser/printing/print_dialog_gtk.cc3
-rw-r--r--chrome/browser/printing/print_dialog_gtk.h2
-rw-r--r--chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.cc1
-rw-r--r--chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.h3
-rw-r--r--chrome/browser/ui/gtk/chrome_gtk_frame.h3
-rw-r--r--chrome/browser/ui/gtk/gtk_chrome_button.h3
-rw-r--r--chrome/browser/ui/gtk/gtk_custom_menu.h2
-rw-r--r--chrome/browser/ui/gtk/gtk_custom_menu_item.h1
-rw-r--r--chrome/browser/ui/gtk/gtk_input_event_box.cc4
-rw-r--r--chrome/browser/ui/gtk/gtk_input_event_box.h1
-rw-r--r--content/browser/gpu/gpu_process_host_ui_shim.cc2
-rw-r--r--printing/print_settings_initializer_gtk.cc2
-rw-r--r--printing/printing_context_gtk.cc2
-rw-r--r--ui/base/gtk/gtk_floating_container.cc9
-rw-r--r--ui/gfx/gtk_preserve_window.cc4
-rw-r--r--ui/gfx/insets.h2
-rw-r--r--ui/gfx/skia_utils_gtk.cc4
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.h2
19 files changed, 24 insertions, 31 deletions
diff --git a/build/common.gypi b/build/common.gypi
index e54edfe..390697c1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -984,6 +984,11 @@
['toolkit_uses_gtk==1', {
'defines': ['TOOLKIT_USES_GTK=1'],
}],
+ ['toolkit_uses_gtk==1 and toolkit_views==0', {
+ # TODO(erg): We are progressively sealing up use of deprecated features
+ # in gtk in preparation for an eventual porting to gtk3.
+ 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'],
+ }],
['chromeos==1', {
'defines': ['OS_CHROMEOS=1'],
}],
diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc
index 0625743..a20225c 100644
--- a/chrome/browser/printing/print_dialog_gtk.cc
+++ b/chrome/browser/printing/print_dialog_gtk.cc
@@ -5,8 +5,7 @@
#include "chrome/browser/printing/print_dialog_gtk.h"
#include <fcntl.h>
-#include <gtk/gtkpagesetupunixdialog.h>
-#include <gtk/gtkprintjob.h>
+#include <gtk/gtkunixprint.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/chrome/browser/printing/print_dialog_gtk.h b/chrome/browser/printing/print_dialog_gtk.h
index 4402eb4..de517a6 100644
--- a/chrome/browser/printing/print_dialog_gtk.h
+++ b/chrome/browser/printing/print_dialog_gtk.h
@@ -7,7 +7,7 @@
#pragma once
#include <gtk/gtk.h>
-#include <gtk/gtkprintunixdialog.h>
+#include <gtk/gtkunixprint.h>
#include "base/compiler_specific.h"
#include "base/file_path.h"
diff --git a/chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.cc b/chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.cc
index 6403256..3e1e566 100644
--- a/chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.cc
+++ b/chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.h"
#include <gdk/gdkkeysyms.h>
-#include <glib.h>
namespace {
diff --git a/chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.h b/chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.h
index 41e5398..14bd6e8 100644
--- a/chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.h
+++ b/chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.h
@@ -6,8 +6,7 @@
#define CHROME_BROWSER_UI_GTK_BUBBLE_BUBBLE_ACCELERATORS_GTK_H_
#pragma once
-#include <gdk/gdktypes.h>
-#include <glib.h>
+#include <gdk/gdk.h>
#include "base/basictypes.h"
diff --git a/chrome/browser/ui/gtk/chrome_gtk_frame.h b/chrome/browser/ui/gtk/chrome_gtk_frame.h
index bbcb2fa..31d37ba 100644
--- a/chrome/browser/ui/gtk/chrome_gtk_frame.h
+++ b/chrome/browser/ui/gtk/chrome_gtk_frame.h
@@ -6,8 +6,7 @@
#define CHROME_BROWSER_UI_GTK_CHROME_GTK_FRAME_H_
#pragma once
-#include <gdk/gdk.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/chrome/browser/ui/gtk/gtk_chrome_button.h b/chrome/browser/ui/gtk/gtk_chrome_button.h
index 1a8e1b8..1843ae1 100644
--- a/chrome/browser/ui/gtk/gtk_chrome_button.h
+++ b/chrome/browser/ui/gtk/gtk_chrome_button.h
@@ -6,8 +6,7 @@
#define CHROME_BROWSER_UI_GTK_GTK_CHROME_BUTTON_H_
#pragma once
-#include <gdk/gdk.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/chrome/browser/ui/gtk/gtk_custom_menu.h b/chrome/browser/ui/gtk/gtk_custom_menu.h
index e832cb0..3a0fa0e 100644
--- a/chrome/browser/ui/gtk/gtk_custom_menu.h
+++ b/chrome/browser/ui/gtk/gtk_custom_menu.h
@@ -16,9 +16,7 @@
// For a more through overview of this system, see the comments in
// gtk_custom_menu_item.h.
-#include <gdk/gdk.h>
#include <gtk/gtk.h>
-#include <gtk/gtkmenuitem.h>
G_BEGIN_DECLS
diff --git a/chrome/browser/ui/gtk/gtk_custom_menu_item.h b/chrome/browser/ui/gtk/gtk_custom_menu_item.h
index d0fbf1a..c3a1f88 100644
--- a/chrome/browser/ui/gtk/gtk_custom_menu_item.h
+++ b/chrome/browser/ui/gtk/gtk_custom_menu_item.h
@@ -30,7 +30,6 @@
// we need to communicate additional information, namely which button was
// activated.
-#include <gdk/gdk.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/chrome/browser/ui/gtk/gtk_input_event_box.cc b/chrome/browser/ui/gtk/gtk_input_event_box.cc
index eb18665..cdfde2b 100644
--- a/chrome/browser/ui/gtk/gtk_input_event_box.cc
+++ b/chrome/browser/ui/gtk/gtk_input_event_box.cc
@@ -4,10 +4,8 @@
#include "chrome/browser/ui/gtk/gtk_input_event_box.h"
-#include <gdk/gdkwindow.h>
+#include <gdk/gdk.h>
#include <gtk/gtk.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkbin.h>
G_BEGIN_DECLS
diff --git a/chrome/browser/ui/gtk/gtk_input_event_box.h b/chrome/browser/ui/gtk/gtk_input_event_box.h
index 86850ac..b3ce484 100644
--- a/chrome/browser/ui/gtk/gtk_input_event_box.h
+++ b/chrome/browser/ui/gtk/gtk_input_event_box.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_UI_GTK_GTK_INPUT_EVENT_BOX_H_
#pragma once
-#include <gdk/gdk.h>
#include <gtk/gtk.h>
// GtkInputEventBox is like GtkEventBox, but with the following differences:
diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc
index f5dcd8f..ed633d1 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.cc
+++ b/content/browser/gpu/gpu_process_host_ui_shim.cc
@@ -22,7 +22,7 @@
// These two #includes need to come after gpu_messages.h.
#include "ui/base/x/x11_util.h"
#include "ui/gfx/size.h"
-#include <gdk/gdkwindow.h> // NOLINT
+#include <gdk/gdk.h> // NOLINT
#include <gdk/gdkx.h> // NOLINT
#endif
diff --git a/printing/print_settings_initializer_gtk.cc b/printing/print_settings_initializer_gtk.cc
index a0df0c8..92316a6 100644
--- a/printing/print_settings_initializer_gtk.cc
+++ b/printing/print_settings_initializer_gtk.cc
@@ -5,7 +5,7 @@
#include "printing/print_settings_initializer_gtk.h"
#include <gtk/gtk.h>
-#include <gtk/gtkprinter.h>
+#include <gtk/gtkunixprint.h>
#include "base/string16.h"
#include "base/utf_string_conversions.h"
diff --git a/printing/printing_context_gtk.cc b/printing/printing_context_gtk.cc
index fc534ea..88e57e6 100644
--- a/printing/printing_context_gtk.cc
+++ b/printing/printing_context_gtk.cc
@@ -5,7 +5,7 @@
#include "printing/printing_context_gtk.h"
#include <gtk/gtk.h>
-#include <gtk/gtkprintunixdialog.h>
+#include <gtk/gtkunixprint.h>
#include "base/logging.h"
#include "base/values.h"
diff --git a/ui/base/gtk/gtk_floating_container.cc b/ui/base/gtk/gtk_floating_container.cc
index edb080f..08449e2 100644
--- a/ui/base/gtk/gtk_floating_container.cc
+++ b/ui/base/gtk/gtk_floating_container.cc
@@ -5,8 +5,6 @@
#include "ui/base/gtk/gtk_floating_container.h"
#include <gtk/gtk.h>
-#include <gtk/gtkmarshal.h>
-#include <gtk/gtkprivate.h>
#include <algorithm>
@@ -41,6 +39,9 @@ GtkFloatingContainerChild* GetChild(GtkFloatingContainer* container,
return NULL;
}
+const GParamFlags kStaticReadWriteProp = static_cast<GParamFlags>(
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
} // namespace
G_BEGIN_DECLS
@@ -99,7 +100,7 @@ static void gtk_floating_container_class_init(
G_MININT,
G_MAXINT,
0,
- static_cast<GParamFlags>(GTK_PARAM_READWRITE)));
+ kStaticReadWriteProp));
gtk_container_class_install_child_property(
container_class,
@@ -110,7 +111,7 @@ static void gtk_floating_container_class_init(
G_MININT,
G_MAXINT,
0,
- static_cast<GParamFlags>(GTK_PARAM_READWRITE)));
+ kStaticReadWriteProp));
floating_container_signals[SET_FLOATING_POSITION] =
g_signal_new("set-floating-position",
diff --git a/ui/gfx/gtk_preserve_window.cc b/ui/gfx/gtk_preserve_window.cc
index 5a80302..79ea818 100644
--- a/ui/gfx/gtk_preserve_window.cc
+++ b/ui/gfx/gtk_preserve_window.cc
@@ -4,10 +4,8 @@
#include "ui/gfx/gtk_preserve_window.h"
-#include <gdk/gdkwindow.h>
+#include <gdk/gdk.h>
#include <gtk/gtk.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkfixed.h>
#include "ui/base/gtk/gtk_compat.h"
diff --git a/ui/gfx/insets.h b/ui/gfx/insets.h
index 56f79b4..147d58f 100644
--- a/ui/gfx/insets.h
+++ b/ui/gfx/insets.h
@@ -12,7 +12,7 @@
#include "ui/base/ui_export.h"
#if defined(TOOLKIT_USES_GTK)
-#include <gtk/gtkstyle.h>
+#include <gtk/gtk.h>
#endif
namespace gfx {
diff --git a/ui/gfx/skia_utils_gtk.cc b/ui/gfx/skia_utils_gtk.cc
index 8667612..8c6f455 100644
--- a/ui/gfx/skia_utils_gtk.cc
+++ b/ui/gfx/skia_utils_gtk.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "ui/gfx/skia_utils_gtk.h"
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
namespace gfx {
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 67036bd..3f42ac8 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -40,7 +40,7 @@
#endif
#if defined(TOOLKIT_USES_GTK)
-#include <gdk/gdkcursor.h>
+#include <gdk/gdk.h>
#endif
struct WebPreferences;
generated by cgit v1.1 at 2024-12-26 19:15:33 +0000