Add GTK4 build option and fix GTK4 build

BUG=876586
R=sky

Change-Id: I97d58a1fcb333781dfa2bceb4c3363b5c914e5df
Reviewed-on: https://chromium-review.googlesource.com/1187197Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585646}

build/config/linux/gtk/BUILD.gn

@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/linux/gtk/gtk.gni")
 import("//build/config/linux/pkg_config.gni")
 
 assert(is_linux, "This file should only be referenced on Linux")
@@ -14,7 +15,7 @@ pkg_config("gtk_internal_config") {
   # misconfigured systems.
   packages = [
     "gmodule-2.0",
-    "gtk+-3.0",
+    "gtk+-${gtk_version}.0",
     "gthread-2.0",
   ]
 }
@@ -42,7 +43,7 @@ group("gtk") {
 
 # Depend on "gtkprint" to get this.
 pkg_config("gtkprint_internal_config") {
-  packages = [ "gtk+-unix-print-3.0" ]
+  packages = [ "gtk+-unix-print-${gtk_version}.0" ]
 }
 
 group("gtkprint") {

build/config/linux/gtk/gtk.gni

+# Copyright 2018 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.
+
+declare_args() {
+  # The (major) version of GTK to build against.
+  gtk_version = 3
+}
+
+assert(gtk_version >= 3 && gtk_version <= 4)

chrome/browser/ui/libgtkui/BUILD.gn

@@ -5,6 +5,7 @@
 assert(is_linux, "This file should only be referenced on Linux")
 
 import("//build/config/features.gni")
+import("//build/config/linux/gtk/gtk.gni")
 import("//printing/buildflags/buildflags.gni")
 
 component("libgtkui") {
@@ -13,8 +14,6 @@ component("libgtkui") {
     "app_indicator_icon.h",
     "app_indicator_icon_menu.cc",
     "app_indicator_icon_menu.h",
-    "chrome_gtk_frame.cc",
-    "chrome_gtk_frame.h",
     "chrome_gtk_menu_subclasses.cc",
     "chrome_gtk_menu_subclasses.h",
     "gtk_background_painter.cc",
@@ -24,8 +23,6 @@ component("libgtkui") {
     "gtk_key_bindings_handler.cc",
     "gtk_key_bindings_handler.h",
     "gtk_signal.h",
-    "gtk_status_icon.cc",
-    "gtk_status_icon.h",
     "gtk_ui.cc",
     "gtk_ui.h",
     "gtk_util.cc",
@@ -57,6 +54,13 @@ component("libgtkui") {
     "x11_input_method_context_impl_gtk.h",
   ]
 
+  if (gtk_version <= 3) {
+    sources += [
+      "gtk_status_icon.cc",
+      "gtk_status_icon.h",
+    ]
+  }
+
   configs += [
     "//build/config/linux/pangocairo",
     "//build/config/linux:x11",

chrome/browser/ui/libgtkui/chrome_gtk_frame.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/libgtkui/chrome_gtk_frame.h"
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-G_BEGIN_DECLS
-
-// MetaFrames declaration
-G_DEFINE_TYPE(MetaFrames, meta_frames, GTK_TYPE_WINDOW)
-
-static void meta_frames_class_init(MetaFramesClass* frames_class) {
-  // Noop since we don't declare anything.
-}
-
-static void meta_frames_init(MetaFrames* button) {
-}
-
-
-// ChromeGtkFrame declaration
-G_DEFINE_TYPE(ChromeGtkFrame, chrome_gtk_frame, meta_frames_get_type())
-
-static void chrome_gtk_frame_class_init(ChromeGtkFrameClass* frame_class) {
-  GtkWidgetClass* widget_class = reinterpret_cast<GtkWidgetClass*>(frame_class);
-
-  // Frame tints:
-  gtk_widget_class_install_style_property(
-      widget_class,
-      g_param_spec_boxed(
-          "frame-color",
-          "Frame Color",
-          "The color that the chrome frame will be. (If unspecified, "
-            " Chrome will take ChromeGtkFrame::bg[SELECTED] and slightly darken"
-            " it.)",
-          GDK_TYPE_COLOR,
-          G_PARAM_READABLE));
-  gtk_widget_class_install_style_property(
-      widget_class,
-      g_param_spec_boxed(
-          "inactive-frame-color",
-          "Inactive Frame Color",
-          "The color that the inactive chrome frame will be. (If"
-            " unspecified, Chrome will take ChromeGtkFrame::bg[INSENSITIVE]"
-            " and slightly darken it.)",
-          GDK_TYPE_COLOR,
-          G_PARAM_READABLE));
-  gtk_widget_class_install_style_property(
-      widget_class,
-      g_param_spec_boxed(
-          "incognito-frame-color",
-          "Incognito Frame Color",
-          "The color that the incognito frame will be. (If unspecified,"
-            " Chrome will take the frame color and tint it by Chrome's default"
-            " incognito tint.)",
-          GDK_TYPE_COLOR,
-          G_PARAM_READABLE));
-  gtk_widget_class_install_style_property(
-      widget_class,
-      g_param_spec_boxed(
-          "incognito-inactive-frame-color",
-          "Incognito Inactive Frame Color",
-          "The color that the inactive incognito frame will be. (If"
-            " unspecified, Chrome will take the frame color and tint it by"
-            " Chrome's default incognito tint.)",
-          GDK_TYPE_COLOR,
-          G_PARAM_READABLE));
-
-  // Frame gradient control:
-  gtk_widget_class_install_style_property(
-      widget_class,
-      g_param_spec_int(
-          "frame-gradient-size",
-          "Chrome Frame Gradient Size",
-          "The size of the gradient on top of the frame image. Specify 0 to"
-            " make the frame a solid color.",
-          0,      // 0 disables the gradient
-          128,    // The frame image is only up to 128 pixels tall.
-          16,     // By default, gradients are 16 pixels high.
-          G_PARAM_READABLE));
-  gtk_widget_class_install_style_property(
-      widget_class,
-      g_param_spec_boxed(
-          "frame-gradient-color",
-          "Frame Gradient Color",
-          "The top color of the chrome frame gradient. (If unspecified,"
-            " chrome will create a lighter tint of frame-color",
-          GDK_TYPE_COLOR,
-          G_PARAM_READABLE));
-  gtk_widget_class_install_style_property(
-      widget_class,
-      g_param_spec_boxed(
-          "inactive-frame-gradient-color",
-          "Inactive Frame Gradient Color",
-          "The top color of the inactive chrome frame gradient. (If"
-            " unspecified, chrome will create a lighter tint of frame-color",
-          GDK_TYPE_COLOR,
-          G_PARAM_READABLE));
-  gtk_widget_class_install_style_property(
-      widget_class,
-      g_param_spec_boxed(
-          "incognito-frame-gradient-color",
-          "Incognito Frame Gradient Color",
-          "The top color of the incognito chrome frame gradient. (If"
-            " unspecified, chrome will create a lighter tint of frame-color",
-          GDK_TYPE_COLOR,
-          G_PARAM_READABLE));
-  gtk_widget_class_install_style_property(
-      widget_class,
-      g_param_spec_boxed(
-          "incognito-inactive-frame-gradient-color",
-          "Incognito Inactive Frame Gradient Color",
-          "The top color of the incognito inactive chrome frame gradient. (If"
-            " unspecified, chrome will create a lighter tint of frame-color",
-          GDK_TYPE_COLOR,
-          G_PARAM_READABLE));
-
-  // Scrollbar color properties:
-  gtk_widget_class_install_style_property(
-      widget_class,
-      g_param_spec_boxed(
-          "scrollbar-slider-prelight-color",
-          "Scrollbar Slider Prelight Color",
-          "The color applied to the mouse is above the tab",
-          GDK_TYPE_COLOR,
-          G_PARAM_READABLE));
-  gtk_widget_class_install_style_property(
-      widget_class,
-      g_param_spec_boxed(
-          "scrollbar-slider-normal-color",
-          "Scrollbar Slider Normal Color",
-          "The color applied to the slider normally",
-          GDK_TYPE_COLOR,
-          G_PARAM_READABLE));
-  gtk_widget_class_install_style_property(
-      widget_class,
-      g_param_spec_boxed(
-          "scrollbar-trough-color",
-          "Scrollbar Trough Color",
-          "The background color of the slider track",
-          GDK_TYPE_COLOR,
-          G_PARAM_READABLE));
-}
-
-static void chrome_gtk_frame_init(ChromeGtkFrame* frame) {
-}
-
-GtkWidget* chrome_gtk_frame_new(void) {
-  return GTK_WIDGET(g_object_new(chrome_gtk_frame_get_type(), "type",
-                                 GTK_WINDOW_TOPLEVEL, nullptr));
-}
-
-G_END_DECLS

chrome/browser/ui/libgtkui/chrome_gtk_frame.h

-// 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.
-
-#ifndef CHROME_BROWSER_UI_LIBGTKUI_CHROME_GTK_FRAME_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_CHROME_GTK_FRAME_H_
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-// This file declares two subclasses of GtkWindow for easier gtk+ theme
-// integration.
-//
-// The first is "MetaFrames," which is (was?) the name of a gobject class in
-// the metacity window manager. To actually get at those values, we need to
-// have an object whose gobject class name string matches the definitions in
-// the gtkrc file. MetaFrames derives from GtkWindow.
-//
-// Metaframes can not be instantiated. It has no constructor; instantiate
-// ChromeGtkFrame instead.
-typedef struct _MetaFrames       MetaFrames;
-typedef struct _MetaFramesClass  MetaFramesClass;
-
-struct _MetaFrames {
-  GtkWindow window;
-};
-
-struct _MetaFramesClass {
-  GtkWindowClass parent_class;
-};
-
-
-// The second is ChromeGtkFrame, which defines a number of optional style
-// properties so theme authors can control how chromium appears in gtk-theme
-// mode.  It derives from MetaFrames in chrome so older themes that declare a
-// MetaFrames theme will still work. New themes should target this class.
-typedef struct _ChromeGtkFrame       ChromeGtkFrame;
-typedef struct _ChromeGtkFrameClass  ChromeGtkFrameClass;
-
-struct _ChromeGtkFrame {
-  MetaFrames frames;
-};
-
-struct _ChromeGtkFrameClass {
-  MetaFramesClass frames_class;
-};
-
-// Creates a GtkWindow object the the class name "ChromeGtkFrame".
-GtkWidget* chrome_gtk_frame_new();
-
-G_END_DECLS
-
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_CHROME_GTK_FRAME_H_

chrome/browser/ui/libgtkui/gtk_key_bindings_handler.cc

@@ -28,10 +28,22 @@ using ui::TextEditCommand;
 // linking requirements regarding GTK+ as we don't have a libgtkui_unittests
 // yet. http://crbug.com/358297.
 
+namespace {
+
+GtkWidget* CreateInvisibleWindow() {
+#if GTK_CHECK_VERSION(3, 90, 0)
+  return gtk_invisible_new();
+#else
+  return gtk_offscreen_window_new();
+#endif
+}
+
+}  // namespace
+
 namespace libgtkui {
 
 GtkKeyBindingsHandler::GtkKeyBindingsHandler()
-    : fake_window_(gtk_offscreen_window_new()),
+    : fake_window_(CreateInvisibleWindow()),
       handler_(CreateNewHandler()),
       has_xkb_(false) {
   gtk_container_add(GTK_CONTAINER(fake_window_), handler_);
@@ -65,11 +77,7 @@ bool GtkKeyBindingsHandler::MatchEvent(
   // will be emitted.
 
   gtk_bindings_activate_event(
-#if GDK_MAJOR_VERSION >= 3
       G_OBJECT(handler_),
-#else
-      GTK_OBJECT(handler_),
-#endif
       &gdk_event);
 
   bool matched = !edit_commands_.empty();
@@ -90,7 +98,9 @@ GtkWidget* GtkKeyBindingsHandler::CreateNewHandler() {
 
   // Prevents it from handling any events by itself.
   gtk_widget_set_sensitive(GTK_WIDGET(handler), FALSE);
+#if !GTK_CHECK_VERSION(3, 90, 0)
   gtk_widget_set_events(GTK_WIDGET(handler), 0);
+#endif
   gtk_widget_set_can_focus(GTK_WIDGET(handler), TRUE);
 
   return GTK_WIDGET(handler);
@@ -145,7 +155,6 @@ void GtkKeyBindingsHandler::HandlerInit(Handler* self) {
 
 void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass* klass) {
   GtkTextViewClass* text_view_class = GTK_TEXT_VIEW_CLASS(klass);
-  GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(klass);
 
   // Overrides all virtual methods related to editor key bindings.
   text_view_class->backspace = BackSpace;
@@ -157,7 +166,10 @@ void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass* klass) {
   text_view_class->paste_clipboard = PasteClipboard;
   text_view_class->set_anchor = SetAnchor;
   text_view_class->toggle_overwrite = ToggleOverwrite;
+#if !GTK_CHECK_VERSION(3, 90, 0)
+  GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(klass);
   widget_class->show_help = ShowHelp;
+#endif
 
   // "move-focus", "move-viewport", "select-all" and "toggle-cursor-visible"
   // have no corresponding virtual methods. Since glib 2.18 (gtk 2.14),
@@ -418,11 +430,13 @@ void GtkKeyBindingsHandler::ToggleOverwrite(GtkTextView* text_view) {
   // Not supported by webkit.
 }
 
+#if !GTK_CHECK_VERSION(3, 90, 0)
 gboolean GtkKeyBindingsHandler::ShowHelp(GtkWidget* widget,
                                          GtkWidgetHelpType arg1) {
   // Just for disabling the default handler.
   return FALSE;
 }
+#endif
 
 void GtkKeyBindingsHandler::MoveFocus(GtkWidget* widget,
                                       GtkDirectionType arg1) {

chrome/browser/ui/libgtkui/gtk_key_bindings_handler.h

@@ -128,8 +128,10 @@ class GtkKeyBindingsHandler {
   // Handler of "toggle-overwrite" signal.
   static void ToggleOverwrite(GtkTextView* text_view);
 
+#if !GTK_CHECK_VERSION(3, 90, 0)
   // Handler of "show-help" signal.
   static gboolean ShowHelp(GtkWidget* widget, GtkWidgetHelpType arg1);
+#endif
 
   // Handler of "move-focus" signal.
   static void MoveFocus(GtkWidget* widget, GtkDirectionType arg1);

chrome/browser/ui/libgtkui/gtk_ui.cc

@@ -30,7 +30,6 @@
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/libgtkui/app_indicator_icon.h"
-#include "chrome/browser/ui/libgtkui/chrome_gtk_frame.h"
 #include "chrome/browser/ui/libgtkui/gtk_event_loop.h"
 #include "chrome/browser/ui/libgtkui/gtk_key_bindings_handler.h"
 #include "chrome/browser/ui/libgtkui/gtk_status_icon.h"
@@ -149,6 +148,7 @@ class GtkButtonImageSource : public gfx::ImageSkiaSource {
     if (focus_) {
       gfx::Rect focus_rect(width, height);
 
+#if !GTK_CHECK_VERSION(3, 90, 0)
       if (!GtkVersionCheck(3, 14)) {
         gint focus_pad;
         gtk_style_context_get_style(context, "focus-padding", &focus_pad,
@@ -166,10 +166,15 @@ class GtkButtonImageSource : public gfx::ImageSkiaSource {
             focus_rect.Offset(child_displacement_x, child_displacement_y);
         }
       }
+#endif
 
       if (!GtkVersionCheck(3, 20)) {
         GtkBorder border;
+#if GTK_CHECK_VERSION(3, 90, 0)
+        gtk_style_context_get_border(context, &border);
+#else
         gtk_style_context_get_border(context, state_flags, &border);
+#endif
         focus_rect.Inset(border.left, border.top, border.right, border.bottom);
       }
 
@@ -216,17 +221,23 @@ struct GObjectDeleter {
 };
 struct GtkIconInfoDeleter {
   void operator()(GtkIconInfo* ptr) {
+#if GTK_CHECK_VERSION(3, 90, 0)
+    g_object_unref(ptr);
+#else
     G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gtk_icon_info_free(ptr);
     G_GNUC_END_IGNORE_DEPRECATIONS
+#endif
   }
 };
 typedef std::unique_ptr<GIcon, GObjectDeleter> ScopedGIcon;
 typedef std::unique_ptr<GtkIconInfo, GtkIconInfoDeleter> ScopedGtkIconInfo;
 typedef std::unique_ptr<GdkPixbuf, GObjectDeleter> ScopedGdkPixbuf;
 
+#if !GTK_CHECK_VERSION(3, 90, 0)
 // Prefix for app indicator ids
 const char kAppIndicatorIdPrefix[] = "chrome_app_indicator_";
+#endif
 
 // Number of app indicators used (used as part of app-indicator id).
 int indicators_count;
@@ -574,12 +585,26 @@ void GtkUi::SetProgressFraction(float percentage) const {
 }
 
 bool GtkUi::IsStatusIconSupported() const {
+#if GTK_CHECK_VERSION(3, 90, 0)
+  // TODO(thomasanderson): Provide some sort of status icon for GTK4.  The GTK3
+  // config has two options.  The first is to use GTK status icons, but these
+  // were removed in GTK4.  The second is to use libappindicator.  However, that
+  // library has a dependency on GTK3, and loading multiple versions of GTK into
+  // the same process is explicitly unsupported.
+  NOTIMPLEMENTED();
+  return false;
+#else
   return true;
+#endif
 }
 
 std::unique_ptr<views::StatusIconLinux> GtkUi::CreateLinuxStatusIcon(
     const gfx::ImageSkia& image,
     const base::string16& tool_tip) const {
+#if GTK_CHECK_VERSION(3, 90, 0)
+  NOTIMPLEMENTED();
+  return nullptr;
+#else
   if (AppIndicatorIcon::CouldOpen()) {
     ++indicators_count;
     return std::unique_ptr<views::StatusIconLinux>(new AppIndicatorIcon(
@@ -589,6 +614,7 @@ std::unique_ptr<views::StatusIconLinux> GtkUi::CreateLinuxStatusIcon(
     return std::unique_ptr<views::StatusIconLinux>(
         new GtkStatusIcon(image, tool_tip));
   }
+#endif
 }
 
 gfx::Image GtkUi::GetIconForContentType(const std::string& content_type,

chrome/browser/ui/libgtkui/gtk_util.cc

@@ -33,8 +33,10 @@ namespace {
 
 const char kAuraTransientParent[] = "aura-transient-parent";
 
-void CommonInitFromCommandLine(const base::CommandLine& command_line,
-                               void (*init_func)(gint*, gchar***)) {
+void CommonInitFromCommandLine(const base::CommandLine& command_line) {
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_init();
+#else
   const std::vector<std::string>& args = command_line.argv();
   int argc = args.size();
   std::unique_ptr<char* []> argv(new char*[argc + 1]);
@@ -49,11 +51,12 @@ void CommonInitFromCommandLine(const base::CommandLine& command_line,
   {
     // http://crbug.com/423873
     ANNOTATE_SCOPED_MEMORY_LEAK;
-    init_func(&argc, &argv_pointer);
+    gtk_init(&argc, &argv_pointer);
   }
   for (size_t i = 0; i < args.size(); ++i) {
     free(argv[i]);
   }
+#endif
 }
 
 }  // namespace
@@ -115,7 +118,7 @@ SkColor SelectedURLColor(SkColor foreground, SkColor background) {
 }
 
 void GtkInitFromCommandLine(const base::CommandLine& command_line) {
-  CommonInitFromCommandLine(command_line, gtk_init);
+  CommonInitFromCommandLine(command_line);
 }
 
 // TODO(erg): This method was copied out of shell_integration_linux.cc. Because
@@ -494,8 +497,12 @@ SkColor GdkRgbaToSkColor(const GdkRGBA& color) {
 
 SkColor GetFgColorFromStyleContext(GtkStyleContext* context) {
   GdkRGBA color;
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_style_context_get_color(context, &color);
+#else
   gtk_style_context_get_color(context, gtk_style_context_get_state(context),
                               &color);
+#endif
   return GdkRgbaToSkColor(color);
 }
 
@@ -524,9 +531,13 @@ SkColor GetFgColor(const std::string& css_selector) {
 
 ScopedCssProvider GetCssProvider(const std::string& css) {
   GtkCssProvider* provider = gtk_css_provider_new();
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_css_provider_load_from_data(provider, css.c_str(), -1);
+#else
   GError* error = nullptr;
   gtk_css_provider_load_from_data(provider, css.c_str(), -1, &error);
   DCHECK(!error);
+#endif
   return ScopedCssProvider(provider);
 }
 
@@ -574,8 +585,12 @@ SkColor GetSelectionBgColor(const std::string& css_selector) {
   // This is verbatim how Gtk gets the selection color on versions before 3.20.
   GdkRGBA selection_color;
   G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_style_context_get_background_color(context, &selection_color);
+#else
   gtk_style_context_get_background_color(
       context, gtk_style_context_get_state(context), &selection_color);
+#endif
   G_GNUC_END_IGNORE_DEPRECATIONS;
   return GdkRgbaToSkColor(selection_color);
 }
@@ -595,9 +610,14 @@ SkColor GetSeparatorColor(const std::string& css_selector) {
   gtk_style_context_get(context, gtk_style_context_get_state(context),
                         "min-width", &w, "min-height", &h, nullptr);
   GtkBorder border, padding;
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_style_context_get_border(context, &border);
+  gtk_style_context_get_padding(context, &padding);
+#else
   GtkStateFlags state = gtk_style_context_get_state(context);
   gtk_style_context_get_border(context, state, &border);
   gtk_style_context_get_padding(context, state, &padding);
+#endif
   w += border.left + padding.left + padding.right + border.right;
   h += border.top + padding.top + padding.bottom + border.bottom;
 

chrome/browser/ui/libgtkui/menu_util.cc

@@ -12,14 +12,19 @@
 #include "ui/base/accelerators/menu_label_accelerator_util_linux.h"
 #include "ui/base/models/menu_model.h"
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 namespace libgtkui {
 
 GtkWidget* BuildMenuItemWithImage(const std::string& label, GtkWidget* image) {
+// GTK4 removed support for image menu items.
+#if GTK_CHECK_VERSION(3, 90, 0)
+  return gtk_menu_item_new_with_mnemonic(label.c_str());
+#else
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   GtkWidget* menu_item = gtk_image_menu_item_new_with_mnemonic(label.c_str());
   gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), image);
+  G_GNUC_END_IGNORE_DEPRECATIONS;
   return menu_item;
+#endif
 }
 
 GtkWidget* BuildMenuItemWithImage(const std::string& label,
@@ -140,10 +145,14 @@ void BuildSubmenuFromModel(ui::MenuModel* model,
           menu_item = BuildMenuItemWithImage(label, icon);
         else
           menu_item = BuildMenuItemWithLabel(label);
+#if !GTK_CHECK_VERSION(3, 90, 0)
+        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
         if (GTK_IS_IMAGE_MENU_ITEM(menu_item)) {
           gtk_image_menu_item_set_always_show_image(
               GTK_IMAGE_MENU_ITEM(menu_item), TRUE);
         }
+        G_GNUC_END_IGNORE_DEPRECATIONS;
+#endif
         break;
       }
 
@@ -233,17 +242,21 @@ void SetMenuItemInfo(GtkWidget* widget, void* block_activation_ptr) {
             base::UTF16ToUTF8(model->GetLabelAt(id)));
 
         gtk_menu_item_set_label(GTK_MENU_ITEM(widget), label.c_str());
+#if !GTK_CHECK_VERSION(3, 90, 0)
+        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
         if (GTK_IS_IMAGE_MENU_ITEM(widget)) {
           gfx::Image icon;
           if (model->GetIconAt(id, &icon)) {
             GdkPixbuf* pixbuf = GdkPixbufFromSkBitmap(*icon.ToSkBitmap());
             gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(widget),
-                gtk_image_new_from_pixbuf(pixbuf));
+                                          gtk_image_new_from_pixbuf(pixbuf));
             g_object_unref(pixbuf);
           } else {
             gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(widget), nullptr);
           }
         }
+        G_GNUC_END_IGNORE_DEPRECATIONS;
+#endif
       }
 
       gtk_widget_show(widget);

chrome/browser/ui/libgtkui/native_theme_gtk.cc

@@ -6,7 +6,6 @@
 
 #include <gtk/gtk.h>
 
-#include "chrome/browser/ui/libgtkui/chrome_gtk_frame.h"
 #include "chrome/browser/ui/libgtkui/chrome_gtk_menu_subclasses.h"
 #include "chrome/browser/ui/libgtkui/gtk_util.h"
 #include "chrome/browser/ui/libgtkui/skia_utils_gtk.h"
@@ -159,9 +158,9 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) {
         return GetFgColor("GtkLabel.link:link:hover:active");
       FALLTHROUGH;
     case ui::NativeTheme::kColorId_LinkEnabled: {
-      if (GtkVersionCheck(3, 12)) {
+      if (GtkVersionCheck(3, 12))
         return GetFgColor("GtkLabel.link:link");
-      }
+#if !GTK_CHECK_VERSION(3, 90, 0)
       auto link_context = GetStyleContextFromCss("GtkLabel.view");
       GdkColor* color;
       gtk_style_context_get_style(link_context, "link-color", &color, nullptr);
@@ -175,6 +174,7 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) {
         G_GNUC_END_IGNORE_DEPRECATIONS;
         return ret_color;
       }
+#endif
 
       // Default color comes from gtklinkbutton.c.
       return SkColorSetRGB(0x00, 0x00, 0xEE);
@@ -607,9 +607,15 @@ void NativeThemeGtk::PaintMenuSeparator(
         "GtkMenu#menu GtkSeparator#separator.horizontal");
     GtkBorder margin, border, padding;
     GtkStateFlags state = gtk_style_context_get_state(context);
+#if GTK_CHECK_VERSION(3, 90, 0)
+    gtk_style_context_get_margin(context, &margin);
+    gtk_style_context_get_border(context, &border);
+    gtk_style_context_get_padding(context, &padding);
+#else
     gtk_style_context_get_margin(context, state, &margin);
     gtk_style_context_get_border(context, state, &border);
     gtk_style_context_get_padding(context, state, &padding);
+#endif
     int min_height = 1;
     gtk_style_context_get(context, state, "min-height", &min_height, nullptr);
     int w = rect.width() - margin.left - margin.right;
@@ -620,6 +626,7 @@ void NativeThemeGtk::PaintMenuSeparator(
     int y = separator_offset(h);
     PaintWidget(canvas, gfx::Rect(x, y, w, h), context, BG_RENDER_NORMAL, true);
   } else {
+#if !GTK_CHECK_VERSION(3, 90, 0)
     auto context = GetStyleContextFromCss(
         "GtkMenu#menu GtkMenuItem#menuitem.separator.horizontal");
     gboolean wide_separators = false;
@@ -644,6 +651,7 @@ void NativeThemeGtk::PaintMenuSeparator(
       flags.setStrokeWidth(1);
       canvas->drawLine(x + 0.5f, y + 0.5f, x + w + 0.5f, y + 0.5f, flags);
     }
+#endif
   }
 }
 

chrome/browser/ui/libgtkui/nav_button_provider_gtk.cc

@@ -79,21 +79,33 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& border) {
 gfx::Insets PaddingFromStyleContext(GtkStyleContext* context,
                                     GtkStateFlags state) {
   GtkBorder padding;
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_style_context_get_padding(context, &padding);
+#else
   gtk_style_context_get_padding(context, state, &padding);
+#endif
   return InsetsFromGtkBorder(padding);
 }
 
 gfx::Insets BorderFromStyleContext(GtkStyleContext* context,
                                    GtkStateFlags state) {
   GtkBorder border;
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_style_context_get_border(context, &border);
+#else
   gtk_style_context_get_border(context, state, &border);
+#endif
   return InsetsFromGtkBorder(border);
 }
 
 gfx::Insets MarginFromStyleContext(GtkStyleContext* context,
                                    GtkStateFlags state) {
   GtkBorder margin;
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_style_context_get_margin(context, &margin);
+#else
   gtk_style_context_get_margin(context, state, &margin);
+#endif
   return InsetsFromGtkBorder(margin);
 }
 
@@ -299,8 +311,12 @@ void NavButtonProviderGtk::RedrawImages(int top_area_height,
   auto header_context = CreateHeaderContext(maximized);
 
   GtkBorder header_padding;
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_style_context_get_padding(header_context, &header_padding);
+#else
   gtk_style_context_get_padding(header_context, GTK_STATE_FLAG_NORMAL,
                                 &header_padding);
+#endif
 
   double scale = 1.0f;
   std::map<chrome::FrameButtonDisplayType, gfx::Size> button_sizes;

chrome/browser/ui/libgtkui/print_dialog_gtk.cc

@@ -301,14 +301,8 @@ void PrintDialogGtk::UpdateSettings(printing::PrintSettings* settings) {
           gtk_page_setup_set_paper_size(page_setup_, custom_size);
           gtk_paper_size_free(custom_size);
         }
-#if GTK_CHECK_VERSION(2, 28, 0)
         g_list_free_full(gtk_paper_sizes,
                          reinterpret_cast<GDestroyNotify>(gtk_paper_size_free));
-#else
-        g_list_foreach(gtk_paper_sizes,
-                       reinterpret_cast<GFunc>(gtk_paper_size_free), nullptr);
-        g_list_free(gtk_paper_sizes);
-#endif
       }
     } else {
       VLOG(1) << "Using default paper size";

chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk.cc

@@ -34,6 +34,23 @@
 
 namespace {
 
+#if GTK_CHECK_VERSION(3, 90, 0)
+// GTK stock items have been deprecated.  The docs say to switch to using the
+// strings "_Open", etc.  However this breaks i18n.  We could supply our own
+// internationalized strings, but the "_" in these strings is significant: it's
+// the keyboard shortcut to select these actions.  TODO(thomasanderson): Provide
+// internationalized strings when GTK provides support for it.
+const char kCancelLabel[] = "_Cancel";
+const char kOpenLabel[] = "_Open";
+const char kSaveLabel[] = "_Save";
+#else
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+const char* kCancelLabel = GTK_STOCK_CANCEL;
+const char* kOpenLabel = GTK_STOCK_OPEN;
+const char* kSaveLabel = GTK_STOCK_SAVE;
+G_GNUC_END_IGNORE_DEPRECATIONS;
+#endif
+
 // Makes sure that .jpg also shows .JPG.
 gboolean FileFilterCaseInsensitive(const GtkFileFilterInfo* file_info,
                                    std::string* file_extension) {
@@ -188,7 +205,9 @@ void SelectFileDialogImplGTK::SelectFileImpl(
     }
   }
 
+#if !GTK_CHECK_VERSION(3, 90, 0)
   gtk_widget_show_all(dialog);
+#endif
 
   // We need to call gtk_window_present after making the widgets visible to make
   // sure window gets correctly raised and gets focus.
@@ -296,11 +315,9 @@ GtkWidget* SelectFileDialogImplGTK::CreateFileOpenHelper(
     const std::string& title,
     const base::FilePath& default_path,
     gfx::NativeWindow parent) {
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   GtkWidget* dialog = gtk_file_chooser_dialog_new(
-      title.c_str(), nullptr, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL,
-      GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, nullptr);
-  G_GNUC_END_IGNORE_DEPRECATIONS;
+      title.c_str(), nullptr, GTK_FILE_CHOOSER_ACTION_OPEN, kCancelLabel,
+      GTK_RESPONSE_CANCEL, kOpenLabel, GTK_RESPONSE_ACCEPT, nullptr);
   SetGtkTransientForAura(dialog, parent);
   AddFilters(GTK_FILE_CHOOSER(dialog));
 
@@ -333,18 +350,16 @@ GtkWidget* SelectFileDialogImplGTK::CreateSelectFolderDialog(
             ? l10n_util::GetStringUTF8(IDS_SELECT_UPLOAD_FOLDER_DIALOG_TITLE)
             : l10n_util::GetStringUTF8(IDS_SELECT_FOLDER_DIALOG_TITLE);
   }
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   std::string accept_button_label =
       (type == SELECT_UPLOAD_FOLDER)
           ? l10n_util::GetStringUTF8(
                 IDS_SELECT_UPLOAD_FOLDER_DIALOG_UPLOAD_BUTTON)
-          : GTK_STOCK_OPEN;
+          : kOpenLabel;
 
   GtkWidget* dialog = gtk_file_chooser_dialog_new(
       title_string.c_str(), nullptr, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, accept_button_label.c_str(),
+      kCancelLabel, GTK_RESPONSE_CANCEL, accept_button_label.c_str(),
       GTK_RESPONSE_ACCEPT, nullptr);
-  G_GNUC_END_IGNORE_DEPRECATIONS;
   SetGtkTransientForAura(dialog, parent);
   GtkFileChooser* chooser = GTK_FILE_CHOOSER(dialog);
   if (type == SELECT_UPLOAD_FOLDER || type == SELECT_EXISTING_FOLDER)
@@ -407,12 +422,9 @@ GtkWidget* SelectFileDialogImplGTK::CreateSaveAsDialog(
       !title.empty() ? title
                      : l10n_util::GetStringUTF8(IDS_SAVE_AS_DIALOG_TITLE);
 
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   GtkWidget* dialog = gtk_file_chooser_dialog_new(
-      title_string.c_str(), nullptr, GTK_FILE_CHOOSER_ACTION_SAVE,
-      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE,
-      GTK_RESPONSE_ACCEPT, nullptr);
-  G_GNUC_END_IGNORE_DEPRECATIONS;
+      title_string.c_str(), nullptr, GTK_FILE_CHOOSER_ACTION_SAVE, kCancelLabel,
+      GTK_RESPONSE_CANCEL, kSaveLabel, GTK_RESPONSE_ACCEPT, nullptr);
   SetGtkTransientForAura(dialog, parent);
 
   AddFilters(GTK_FILE_CHOOSER(dialog));

chrome/browser/ui/libgtkui/settings_provider_gtk.cc

@@ -26,6 +26,10 @@ std::string GetGtkSettingsStringProperty(GtkSettings* settings,
 }
 
 std::string GetDecorationLayoutFromGtkWindow() {
+#if GTK_CHECK_VERSION(3, 90, 0)
+  NOTREACHED();
+  return kDefaultGtkLayout;
+#else
   static ScopedStyleContext context;
   if (!context) {
     context = GetStyleContextFromCss("");
@@ -39,6 +43,7 @@ std::string GetDecorationLayoutFromGtkWindow() {
   std::string layout(layout_c);
   g_free(layout_c);
   return layout;
+#endif
 }
 
 void ParseActionString(const std::string& value,

chrome/browser/ui/libgtkui/skia_utils_gtk.cc

@@ -17,6 +17,7 @@ namespace libgtkui {
 // To get back, we can just right shift by eight
 // (or, formulated differently, i == (i*257)/256 for all i < 256).
 
+#if !GTK_CHECK_VERSION(3, 90, 0)
 SkColor GdkColorToSkColor(GdkColor color) {
   return SkColorSetRGB(color.red >> 8, color.green >> 8, color.blue >> 8);
 }
@@ -28,6 +29,7 @@ GdkColor SkColorToGdkColor(SkColor color) {
       static_cast<guint16>(SkColorGetB(color) * kSkiaToGDKMultiplier)};
   return gdk_color;
 }
+#endif
 
 const SkBitmap GdkPixbufToImageSkia(GdkPixbuf* pixbuf) {
   // TODO(erg): What do we do in the case where the pixbuf fails these dchecks?

chrome/browser/ui/libgtkui/skia_utils_gtk.h

@@ -5,15 +5,19 @@
 #ifndef CHROME_BROWSER_UI_LIBGTKUI_SKIA_UTILS_GTK_H_
 #define CHROME_BROWSER_UI_LIBGTKUI_SKIA_UTILS_GTK_H_
 
+#include <gtk/gtk.h>
 #include <stdint.h>
 
 #include "third_party/skia/include/core/SkColor.h"
 
+#if !GTK_CHECK_VERSION(3, 90, 0)
 typedef struct _GdkColor GdkColor;
+#endif
 typedef struct _GdkPixbuf GdkPixbuf;
 
 class SkBitmap;
 
+#if !GTK_CHECK_VERSION(3, 90, 0)
 // Define a macro for creating GdkColors from RGB values.  This is a macro to
 // allow static construction of literals, etc.  Use this like:
 //   GdkColor white = GDK_COLOR_RGB(0xff, 0xff, 0xff);
@@ -24,9 +28,11 @@ class SkBitmap;
     g * ::libgtkui::kSkiaToGDKMultiplier,    \
     b * ::libgtkui::kSkiaToGDKMultiplier,    \
   }
+#endif
 
 namespace libgtkui {
 
+#if !GTK_CHECK_VERSION(3, 90, 0)
 // Multiply uint8_t color components by this.
 const int kSkiaToGDKMultiplier = 257;
 
@@ -35,6 +41,7 @@ SkColor GdkColorToSkColor(GdkColor color);
 
 // Converts ARGB to GdkColor.
 GdkColor SkColorToGdkColor(SkColor color);
+#endif
 
 const SkBitmap GdkPixbufToImageSkia(GdkPixbuf* pixbuf);
 

chrome/browser/ui/libgtkui/x11_input_method_context_impl_gtk.cc

@@ -71,7 +71,12 @@ bool X11InputMethodContextImplGtk::DispatchKeyEvent(
   }
 
   if (event->key.window != gdk_last_set_client_window_) {
+#if GTK_CHECK_VERSION(3, 90, 0)
+    gtk_im_context_set_client_widget(gtk_context_,
+                                     GTK_WIDGET(event->key.window));
+#else
     gtk_im_context_set_client_window(gtk_context_, event->key.window);
+#endif
     gdk_last_set_client_window_ = event->key.window;
   }
 
@@ -209,19 +214,11 @@ GdkEvent* X11InputMethodContextImplGtk::GdkEventFromNativeEvent(
   g_free(keyvals);
   keyvals = nullptr;
 // Get a GdkWindow.
-#if GTK_CHECK_VERSION(2, 24, 0)
   GdkWindow* window = gdk_x11_window_lookup_for_display(display, xkey.window);
-#else
-  GdkWindow* window = gdk_window_lookup_for_display(display, xkey.window);
-#endif
   if (window)
     g_object_ref(window);
   else
-#if GTK_CHECK_VERSION(2, 24, 0)
     window = gdk_x11_window_foreign_new_for_display(display, xkey.window);
-#else
-    window = gdk_window_foreign_new_for_display(display, xkey.window);
-#endif
   if (!window) {
     LOG(ERROR) << "Cannot get a GdkWindow for a key event.";
     return nullptr;

remoting/host/continue_window_linux.cc

@@ -99,12 +99,21 @@ void ContinueWindowGtk::CreateWindow() {
       gtk_label_new(l10n_util::GetStringUTF8(IDS_CONTINUE_PROMPT).c_str());
   gtk_label_set_line_wrap(GTK_LABEL(text_label), TRUE);
   // TODO(lambroslambrou): Fix magic numbers, as in disconnect_window_gtk.cc.
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_widget_set_margin_start(GTK_WIDGET(text_label), 12);
+  gtk_widget_set_margin_end(GTK_WIDGET(text_label), 12);
+  gtk_widget_set_margin_top(GTK_WIDGET(text_label), 12);
+  gtk_widget_set_margin_bottom(GTK_WIDGET(text_label), 12);
+#else
   G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   gtk_misc_set_padding(GTK_MISC(text_label), 12, 12);
   G_GNUC_END_IGNORE_DEPRECATIONS;
+#endif
   gtk_container_add(GTK_CONTAINER(content_area), text_label);
 
+#if !GTK_CHECK_VERSION(3, 90, 0)
   gtk_widget_show_all(content_area);
+#endif
 }
 
 void ContinueWindowGtk::OnResponse(GtkDialog* dialog, int response_id) {

remoting/host/disconnect_window_linux.cc

@@ -186,7 +186,9 @@ void DisconnectWindowGtk::Start(
   gtk_window_set_deletable(window, FALSE);
 
   // Allow custom rendering of the background pixmap.
+#if !GTK_CHECK_VERSION(3, 90, 0)
   gtk_widget_set_app_paintable(disconnect_window_, TRUE);
+#endif
   g_signal_connect(disconnect_window_, "draw", G_CALLBACK(OnDrawThunk), this);
 
   // Handle window resizing, to regenerate the background pixmap and window
@@ -199,7 +201,9 @@ void DisconnectWindowGtk::Start(
                    G_CALLBACK(OnConfigureThunk), this);
 
   // Handle mouse events to allow the user to drag the window around.
+#if !GTK_CHECK_VERSION(3, 90, 0)
   gtk_widget_set_events(disconnect_window_, GDK_BUTTON_PRESS_MASK);
+#endif
   g_signal_connect(disconnect_window_, "button-press-event",
                    G_CALLBACK(OnButtonPressThunk), this);
 
@@ -207,24 +211,40 @@ void DisconnectWindowGtk::Start(
   // The alignment sets narrow margins at the top and bottom, compared with
   // left and right.  The left margin is made larger to accommodate the
   // window movement gripper.
+  GtkWidget* button_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
+  gtk_box_set_homogeneous(GTK_BOX(button_row), FALSE);
+
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_widget_set_margin_start(GTK_WIDGET(button_row), 24);
+  gtk_widget_set_margin_end(GTK_WIDGET(button_row), 12);
+  gtk_widget_set_margin_top(GTK_WIDGET(button_row), 8);
+  gtk_widget_set_margin_bottom(GTK_WIDGET(button_row), 8);
+  gtk_container_add(GTK_CONTAINER(window), button_row);
+#else
   G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   GtkWidget* align = gtk_alignment_new(0, 0, 1, 1);
   gtk_alignment_set_padding(GTK_ALIGNMENT(align), 8, 8, 24, 12);
   G_GNUC_END_IGNORE_DEPRECATIONS;
   gtk_container_add(GTK_CONTAINER(window), align);
-
-  GtkWidget* button_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
-  gtk_box_set_homogeneous(GTK_BOX(button_row), FALSE);
   gtk_container_add(GTK_CONTAINER(align), button_row);
+#endif
 
   button_ = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_STOP_SHARING_BUTTON).c_str());
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_box_pack_end(GTK_BOX(button_row), button_);
+#else
   gtk_box_pack_end(GTK_BOX(button_row), button_, FALSE, FALSE, 0);
+#endif
 
   g_signal_connect(button_, "clicked", G_CALLBACK(OnClickedThunk), this);
 
   message_ = gtk_label_new(nullptr);
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_box_pack_end(GTK_BOX(button_row), message_);
+#else
   gtk_box_pack_end(GTK_BOX(button_row), message_, FALSE, FALSE, 0);
+#endif
 
   // Override any theme setting for the text color, so that the text is
   // readable against the window's background pixmap.
@@ -234,13 +254,16 @@ void DisconnectWindowGtk::Start(
   gtk_label_set_attributes(GTK_LABEL(message_), attributes);
   pango_attr_list_unref(attributes);
 
+#if !GTK_CHECK_VERSION(3, 90, 0)
+  // GTK4 always uses an RGBA visual for windows.
   GdkScreen* screen = gtk_widget_get_screen(disconnect_window_);
   GdkVisual* visual = gdk_screen_get_rgba_visual(screen);
-
   if (visual)
     gtk_widget_set_visual(disconnect_window_, visual);
 
+  // GTK4 shows windows by default.
   gtk_widget_show_all(disconnect_window_);
+#endif
 
   // Extract the user name from the JID.
   std::string client_jid = client_session_control_->client_jid();

remoting/host/it2me/it2me_confirmation_dialog_linux.cc

@@ -123,12 +123,21 @@ void It2MeConfirmationDialogLinux::CreateWindow(
           remote_user_email);
   GtkWidget* text_label = gtk_label_new(base::UTF16ToUTF8(dialog_text).c_str());
   gtk_label_set_line_wrap(GTK_LABEL(text_label), true);
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_widget_set_margin_start(GTK_WIDGET(text_label), 12);
+  gtk_widget_set_margin_end(GTK_WIDGET(text_label), 12);
+  gtk_widget_set_margin_top(GTK_WIDGET(text_label), 12);
+  gtk_widget_set_margin_bottom(GTK_WIDGET(text_label), 12);
+#else
   G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   gtk_misc_set_padding(GTK_MISC(text_label), 12, 12);
   G_GNUC_END_IGNORE_DEPRECATIONS;
+#endif
 
   gtk_container_add(GTK_CONTAINER(content_area), text_label);
+#if !GTK_CHECK_VERSION(3, 90, 0)
   gtk_widget_show_all(content_area);
+#endif
 
   gtk_window_set_urgency_hint(GTK_WINDOW(confirmation_window_), true);
   gtk_window_present(GTK_WINDOW(confirmation_window_));

remoting/host/it2me/it2me_native_messaging_host_main.cc

@@ -109,7 +109,11 @@ int It2MeNativeMessagingHostMain(int argc, char** argv) {
   // Required for any calls into GTK functions, such as the Disconnect and
   // Continue windows. Calling with nullptr arguments because we don't have
   // any command line arguments for gtk to consume.
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_init();
+#else
   gtk_init(nullptr, nullptr);
+#endif
 
   // Need to prime the host OS version value for linux to prevent IO on the
   // network thread. base::GetLinuxDistro() caches the result.

remoting/host/remoting_me2me_host.cc

@@ -1713,7 +1713,11 @@ int HostProcessMain() {
     // Required for any calls into GTK functions, such as the Disconnect and
     // Continue windows, though these should not be used for the Me2Me case
     // (crbug.com/104377).
+#if GTK_CHECK_VERSION(3, 90, 0)
+    gtk_init();
+#else
     gtk_init(nullptr, nullptr);
+#endif
   }
 
   // Need to prime the host OS version value for linux to prevent IO on the

remoting/test/it2me_standalone_host_main.cc

@@ -28,7 +28,11 @@ int main(int argc, const char** argv) {
   // Required for any calls into GTK functions, such as the Disconnect and
   // Continue windows. Calling with nullptr arguments because we don't have
   // any command line arguments for gtk to consume.
+#if GTK_CHECK_VERSION(3, 90, 0)
+  gtk_init();
+#else
   gtk_init(nullptr, nullptr);
+#endif
 
   // Need to prime the host OS version value for linux to prevent IO on the
   // network thread. base::GetLinuxDistro() caches the result.