Move //chrome/browser/ui/gtk to //ui/gtk

BUG=1002674

Change-Id: Idf223f1193cbe1dde07901f5e28f1422b464cf04
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2098159
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756059}

build/config/linux/gtk/BUILD.gn

@@ -22,9 +22,12 @@ pkg_config("gtk_internal_config") {
 
 group("gtk") {
   visibility = [
-    # This is the only target that should depend on GTK.
+    # This is the only directory that should depend on GTK.
     "//ui/gtk:*",
 
+    # This should probably be moved into //ui/gtk.
+    "//ui/ozone/platform/wayland",
+
     # These are all for WebRTC.
     "//examples:peerconnection_client",
     "//remoting/host/linux",
@@ -46,6 +49,6 @@ pkg_config("gtkprint_internal_config") {
 }
 
 group("gtkprint") {
-  visibility = [ "//chrome/browser/ui/gtk:*" ]
+  visibility = [ "//ui/gtk:*" ]
   public_configs = [ ":gtkprint_internal_config" ]
 }

chrome/browser/BUILD.gn

@@ -4477,7 +4477,7 @@ jumbo_static_library("browser") {
       "//ui/snapshot",
     ]
     if (use_gtk) {
-      deps += [ "//chrome/browser/ui/gtk" ]
+      deps += [ "//ui/gtk" ]
     }
   }
 

chrome/browser/ui/BUILD.gn

@@ -2697,7 +2697,7 @@ jumbo_static_library("ui") {
     }
     if (use_gtk) {
       # This is the only component that can interact with gtk.
-      deps += [ "//chrome/browser/ui/gtk" ]
+      deps += [ "//ui/gtk" ]
     }
   }
 
@@ -3571,7 +3571,6 @@ jumbo_static_library("ui") {
         ]
         if (use_gtk) {
           deps += [
-            "//chrome/browser/ui/gtk",
             "//ui/gtk",
           ]
           if (use_x11) {

chrome/browser/ui/gtk/BUILD.gn

@@ -1,93 +0,0 @@
-# Copyright 2014 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.
-
-assert(is_linux, "This file should only be referenced on Linux")
-
-import("//build/config/features.gni")
-import("//build/config/jumbo.gni")
-import("//build/config/linux/gtk/gtk.gni")
-import("//printing/buildflags/buildflags.gni")
-import("//ui/ozone/ozone.gni")
-
-jumbo_component("gtk") {
-  sources = [
-    "gtk_key_bindings_handler.cc",
-    "gtk_key_bindings_handler.h",
-    "gtk_ui.cc",
-    "gtk_ui.h",
-    "gtk_util.cc",
-    "gtk_util.h",
-    "input_method_context_impl_gtk.cc",
-    "input_method_context_impl_gtk.h",
-    "native_theme_gtk.cc",
-    "native_theme_gtk.h",
-    "nav_button_provider_gtk.cc",
-    "nav_button_provider_gtk.h",
-    "print_dialog_gtk.cc",
-    "print_dialog_gtk.h",
-    "printing_gtk_util.cc",
-    "printing_gtk_util.h",
-    "select_file_dialog_impl.cc",
-    "select_file_dialog_impl.h",
-    "select_file_dialog_impl_gtk.cc",
-    "select_file_dialog_impl_gtk.h",
-    "select_file_dialog_impl_kde.cc",
-    "settings_provider.h",
-    "settings_provider_gtk.cc",
-    "settings_provider_gtk.h",
-  ]
-
-  configs += [ "//build/config/linux/pangocairo" ]
-
-  if (use_gio) {
-    sources += [
-      "settings_provider_gsettings.cc",
-      "settings_provider_gsettings.h",
-    ]
-    configs += [ "//build/linux:gio_config" ]
-  }
-
-  if (use_cups) {
-    configs += [ "//printing:cups" ]
-  }
-
-  defines = [ "IS_GTK_IMPL" ]
-
-  deps = [
-    "//base",
-    "//build/config/linux/gtk:gtkprint",
-    "//printing",
-    "//skia",
-
-    # GTK pulls pangoft2, which requires HarfBuzz symbols. When linking
-    # our own HarfBuzz avoid mixing symbols from system HarfBuzz and
-    # our own through the indirect dependency to harfbuzz-ng here.
-    "//third_party:freetype_harfbuzz",
-    "//ui/aura",
-    "//ui/base",
-    "//ui/base/ime",
-    "//ui/base/ime/linux",
-    "//ui/display",
-    "//ui/events",
-    "//ui/events:dom_keyboard_layout",
-    "//ui/events:dom_keycode_converter",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-    "//ui/gtk",
-    "//ui/native_theme",
-    "//ui/shell_dialogs",
-    "//ui/strings",
-    "//ui/views",
-  ]
-  public_deps = [ "//chrome/browser:theme_properties" ]
-
-  if (use_x11 || ozone_platform_x11) {
-    # select_file_dialog_impl_kde.cc still refers to XID
-    configs += [ "//build/config/linux:x11" ]
-  }
-
-  if (use_ozone) {
-    deps += [ "//ui/ozone" ]
-  }
-}

chrome/browser/ui/gtk/OWNERS

@@ -1,4 +0,0 @@
-estade@chromium.org
-thomasanderson@chromium.org
-
-# COMPONENT: UI>Browser>Themes

chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc

@@ -12,7 +12,7 @@
 #include "ui/views/linux_ui/linux_ui.h"
 
 #if BUILDFLAG(USE_GTK)
-#include "chrome/browser/ui/gtk/gtk_ui.h"
+#include "ui/gtk/gtk_ui.h"
 #include "ui/gtk/gtk_ui_delegate.h"
 #endif
 

docs/linux/gtk_theme_integration.md

@@ -49,4 +49,4 @@ For GTK3.20 or later, themes will as usual have to replace ".entry" with
 "entry".
 
 The list of CSS selectors that Chromium uses to determine its colors is in
-//src/chrome/browser/ui/gtk/native_theme_gtk.cc.
+//src/ui/gtk/native_theme_gtk.cc.

tools/cfi/blacklist.txt

@@ -173,8 +173,8 @@ src:*third_party/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc
 src:*media/cdm/*
 src:*third_party/swiftshader/*
 src:*base/native_library_unittest.cc
-src:*chrome/browser/ui/gtk/app_indicator_icon.cc
+src:*ui/gtk/app_indicator_icon.cc
-src:*chrome/browser/ui/gtk/unity_service.cc
+src:*ui/gtk/unity_service.cc
 src:*components/cronet/native/*
 src:*third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
 

ui/gtk/BUILD.gn

@@ -2,22 +2,106 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+assert(is_linux, "This file should only be referenced on Linux")
+
+import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
 import("//build/config/linux/gtk/gtk.gni")
 import("//build/config/ui.gni")
+import("//printing/buildflags/buildflags.gni")
 import("//ui/ozone/ozone.gni")
 
-component("gtk") {
+component("gtk_ui_delegate") {
-  output_name = "ui_gtk"
+  public = [ "gtk_ui_delegate.h" ]
+  sources = [ "gtk_ui_delegate.cc" ]
+  deps = [
+    "//base",
+    "//ui/gfx",
+  ]
+  defines = [ "IS_GTK_IMPL" ]
+}
+
+jumbo_component("gtk") {
+  public = [ "gtk_ui.h" ]
   sources = [
-    "gtk_ui_delegate.cc",
+    "gtk_key_bindings_handler.cc",
-    "gtk_ui_delegate.h",
+    "gtk_key_bindings_handler.h",
+    "gtk_ui.cc",
+    "gtk_util.cc",
+    "gtk_util.h",
+    "input_method_context_impl_gtk.cc",
+    "input_method_context_impl_gtk.h",
+    "native_theme_gtk.cc",
+    "native_theme_gtk.h",
+    "nav_button_provider_gtk.cc",
+    "nav_button_provider_gtk.h",
+    "print_dialog_gtk.cc",
+    "print_dialog_gtk.h",
+    "printing_gtk_util.cc",
+    "printing_gtk_util.h",
+    "select_file_dialog_impl.cc",
+    "select_file_dialog_impl.h",
+    "select_file_dialog_impl_gtk.cc",
+    "select_file_dialog_impl_gtk.h",
+    "select_file_dialog_impl_kde.cc",
+    "settings_provider.h",
+    "settings_provider_gtk.cc",
+    "settings_provider_gtk.h",
   ]
-  public_deps = [
+  defines = [ "IS_GTK_IMPL" ]
+  configs += [ "//build/config/linux/pangocairo" ]
+  if (use_gio) {
+    sources += [
+      "settings_provider_gsettings.cc",
+      "settings_provider_gsettings.h",
+    ]
+    configs += [ "//build/linux:gio_config" ]
+  }
+
+  if (use_cups) {
+    configs += [ "//printing:cups" ]
+  }
+
+  deps = [
+    "//base",
+    "//build/config/linux/gtk:gtkprint",
+    "//printing",
+    "//skia",
+
+    # GTK pulls pangoft2, which requires HarfBuzz symbols. When linking
+    # our own HarfBuzz avoid mixing symbols from system HarfBuzz and
+    # our own through the indirect dependency to harfbuzz-ng here.
     "//build/config/linux/gtk",
+    "//chrome/browser:theme_properties",
+    "//third_party:freetype_harfbuzz",
+    "//ui/aura",
+    "//ui/base",
     "//ui/base:buildflags",
+    "//ui/base/ime",
+    "//ui/base/ime/linux",
+    "//ui/display",
+    "//ui/events",
+    "//ui/events:dom_keyboard_layout",
+    "//ui/events:dom_keycode_converter",
+    "//ui/gfx",
     "//ui/gfx:native_widget_types",
+    "//ui/gfx/geometry",
+    "//ui/native_theme",
+    "//ui/shell_dialogs",
+    "//ui/strings",
+    "//ui/views",
   ]
-  defines = [ "IS_UI_GTK_IMPL" ]
+  public_deps = [ ":gtk_ui_delegate" ]
+
+  if (use_x11 || ozone_platform_x11) {
+    # select_file_dialog_impl_kde.cc still refers to XID
+    configs += [ "//build/config/linux:x11" ]
+  }
+
+  # TODO: This should be removed.
+  if (use_ozone) {
+    deps += [ "//ui/ozone" ]
+  }
 }
 
 component("x") {
@@ -28,13 +112,14 @@ component("x") {
     "gtk_ui_delegate_x11.cc",
     "gtk_ui_delegate_x11.h",
   ]
-  public_deps = [ ":gtk" ]
   deps = [
     "//base",
+    "//build/config/linux/gtk",
     "//ui/base",
     "//ui/events/platform/x11",
     "//ui/gfx/x",
   ]
+  public_deps = [ ":gtk_ui_delegate" ]
   defines = [ "IS_UI_GTK_X_IMPL" ]
   configs += [ "//build/config/linux:x11" ]
 }

ui/gtk/DEPS

@@ -1,6 +1,17 @@
 include_rules = [
+  "+chrome/browser/themes/theme_properties.h",
+  "+printing",
+  "+third_party/skia",
+  "+ui/aura",
+  "+ui/base",
+  "+ui/display",
+  "+ui/events",
   "+ui/gfx",
-  "+ui/gfx/x",
+  "+ui/native_theme",
-  "+ui/events/platform/x11",
+  "+ui/shell_dialogs",
-  "+ui/base/glib",
+  "+ui/strings",
+  "+ui/views",
+
+  # TODO: This should be removed.
+  "+ui/ozone",
 ]

ui/gtk/OWNERS

@@ -1 +1,4 @@
+estade@chromium.org
 thomasanderson@chromium.org
+
+# COMPONENT: UI>Browser>Themes

ui/gtk/gtk_key_bindings_handler.cc

@@ -2,7 +2,7 @@
 // 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_key_bindings_handler.h"
+#include "ui/gtk/gtk_key_bindings_handler.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <stddef.h>
@@ -12,9 +12,9 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "ui/base/ime/text_edit_commands.h"
 #include "ui/events/event.h"
+#include "ui/gtk/gtk_util.h"
 
 using ui::TextEditCommand;
 

ui/gtk/gtk_key_bindings_handler.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_GTK_KEY_BINDINGS_HANDLER_H_
+#ifndef UI_GTK_GTK_KEY_BINDINGS_HANDLER_H_
-#define CHROME_BROWSER_UI_GTK_GTK_KEY_BINDINGS_HANDLER_H_
+#define UI_GTK_GTK_KEY_BINDINGS_HANDLER_H_
 
 #include <gtk/gtk.h>
 
@@ -139,4 +139,4 @@ class GtkKeyBindingsHandler {
 
 }  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_GTK_GTK_KEY_BINDINGS_HANDLER_H_
+#endif  // UI_GTK_GTK_KEY_BINDINGS_HANDLER_H_

ui/gtk/gtk_ui.cc

@@ -2,7 +2,7 @@
 // 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_ui.h"
+#include "ui/gtk/gtk_ui.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
@@ -24,15 +24,6 @@
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/themes/theme_properties.h"
-#include "chrome/browser/ui/gtk/gtk_key_bindings_handler.h"
-#include "chrome/browser/ui/gtk/gtk_util.h"
-#include "chrome/browser/ui/gtk/input_method_context_impl_gtk.h"
-#include "chrome/browser/ui/gtk/native_theme_gtk.h"
-#include "chrome/browser/ui/gtk/nav_button_provider_gtk.h"
-#include "chrome/browser/ui/gtk/print_dialog_gtk.h"
-#include "chrome/browser/ui/gtk/printing_gtk_util.h"
-#include "chrome/browser/ui/gtk/select_file_dialog_impl.h"
-#include "chrome/browser/ui/gtk/settings_provider_gtk.h"
 #include "printing/buildflags/buildflags.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -54,7 +45,16 @@
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/gfx/skia_util.h"
+#include "ui/gtk/gtk_key_bindings_handler.h"
 #include "ui/gtk/gtk_ui_delegate.h"
+#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/input_method_context_impl_gtk.h"
+#include "ui/gtk/native_theme_gtk.h"
+#include "ui/gtk/nav_button_provider_gtk.h"
+#include "ui/gtk/print_dialog_gtk.h"
+#include "ui/gtk/printing_gtk_util.h"
+#include "ui/gtk/select_file_dialog_impl.h"
+#include "ui/gtk/settings_provider_gtk.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/shell_dialogs/select_file_policy.h"
 #include "ui/views/controls/button/button.h"
@@ -65,7 +65,7 @@
 #include "ui/views/linux_ui/window_button_order_observer.h"
 
 #if defined(USE_GIO)
-#include "chrome/browser/ui/gtk/settings_provider_gsettings.h"
+#include "ui/gtk/settings_provider_gsettings.h"
 #endif
 
 #if defined(USE_OZONE)

ui/gtk/gtk_ui.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_GTK_UI_H_
+#ifndef UI_GTK_GTK_UI_H_
-#define CHROME_BROWSER_UI_GTK_GTK_UI_H_
+#define UI_GTK_GTK_UI_H_
 
 #include <map>
 #include <memory>
@@ -222,4 +222,4 @@ class GtkUi : public views::LinuxUI {
 COMPONENT_EXPORT(GTK)
 views::LinuxUI* BuildGtkUi(ui::GtkUiDelegate* delegate);
 
-#endif  // CHROME_BROWSER_UI_GTK_GTK_UI_H_
+#endif  // UI_GTK_GTK_UI_H_

ui/gtk/gtk_ui_delegate.h

@@ -20,7 +20,7 @@ namespace ui {
 // layers (e.g: ozone). Linux backends (e.g: ozone/x11, aura/x11, ozone/wayland)
 // must provide a GtkUiDelegate implementation and inject its singleton instance
 // of it via |SetInstance| in order to be able to use GtkUi.
-class COMPONENT_EXPORT(UI_GTK) GtkUiDelegate {
+class COMPONENT_EXPORT(GTK) GtkUiDelegate {
  public:
   virtual ~GtkUiDelegate() = default;
 

ui/gtk/gtk_util.cc

@@ -2,7 +2,7 @@
 // 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 "ui/gtk/gtk_util.h"
 
 #include <dlfcn.h>
 #include <gdk/gdk.h>
@@ -19,7 +19,6 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/ui/gtk/gtk_ui.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/event.h"
@@ -28,6 +27,7 @@
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gtk/gtk_ui.h"
 #include "ui/gtk/gtk_ui_delegate.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/views/linux_ui/linux_ui.h"

ui/gtk/gtk_util.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_GTK_UTIL_H_
+#ifndef UI_GTK_GTK_UTIL_H_
-#define CHROME_BROWSER_UI_GTK_GTK_UTIL_H_
+#define UI_GTK_GTK_UTIL_H_
 
 #include <gtk/gtk.h>
 #include <string>
@@ -198,4 +198,4 @@ GdkEvent* GdkEventFromKeyEvent(const ui::KeyEvent& key_event);
 
 }  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_GTK_GTK_UTIL_H_
+#endif  // UI_GTK_GTK_UTIL_H_

ui/gtk/input_method_context_impl_gtk.cc

@@ -2,7 +2,7 @@
 // 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/input_method_context_impl_gtk.h"
+#include "ui/gtk/input_method_context_impl_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
@@ -10,8 +10,6 @@
 #include <stddef.h>
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ui/gtk/gtk_ui.h"
-#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/linux/composition_text_util_pango.h"
@@ -19,7 +17,9 @@
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gtk/gtk_ui.h"
 #include "ui/gtk/gtk_ui_delegate.h"
+#include "ui/gtk/gtk_util.h"
 #include "ui/views/linux_ui/linux_ui.h"
 
 namespace gtk {

ui/gtk/input_method_context_impl_gtk.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_INPUT_METHOD_CONTEXT_IMPL_GTK_H_
+#ifndef UI_GTK_INPUT_METHOD_CONTEXT_IMPL_GTK_H_
-#define CHROME_BROWSER_UI_GTK_INPUT_METHOD_CONTEXT_IMPL_GTK_H_
+#define UI_GTK_INPUT_METHOD_CONTEXT_IMPL_GTK_H_
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
@@ -81,4 +81,4 @@ class InputMethodContextImplGtk : public ui::LinuxInputMethodContext {
 
 }  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_GTK_INPUT_METHOD_CONTEXT_IMPL_GTK_H_
+#endif  // UI_GTK_INPUT_METHOD_CONTEXT_IMPL_GTK_H_

ui/gtk/native_theme_gtk.cc

@@ -2,16 +2,16 @@
 // 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/native_theme_gtk.h"
+#include "ui/gtk/native_theme_gtk.h"
 
 #include <gtk/gtk.h>
 
-#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/gfx/skia_util.h"
+#include "ui/gtk/gtk_util.h"
 
 namespace gtk {
 

ui/gtk/native_theme_gtk.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_NATIVE_THEME_GTK_H_
+#ifndef UI_GTK_NATIVE_THEME_GTK_H_
-#define CHROME_BROWSER_UI_GTK_NATIVE_THEME_GTK_H_
+#define UI_GTK_NATIVE_THEME_GTK_H_
 
 #include "base/macros.h"
 #include "base/no_destructor.h"
@@ -91,4 +91,4 @@ class NativeThemeGtk : public ui::NativeThemeBase {
 
 }  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_GTK_NATIVE_THEME_GTK_H_
+#endif  // UI_GTK_NATIVE_THEME_GTK_H_

ui/gtk/nav_button_provider_gtk.cc

@@ -2,14 +2,14 @@
 // 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/nav_button_provider_gtk.h"
+#include "ui/gtk/nav_button_provider_gtk.h"
 
 #include <gtk/gtk.h>
 
-#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "ui/base/glib/scoped_gobject.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_source.h"
+#include "ui/gtk/gtk_util.h"
 #include "ui/views/widget/widget.h"
 
 namespace gtk {

ui/gtk/nav_button_provider_gtk.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_NAV_BUTTON_PROVIDER_GTK_H_
+#ifndef UI_GTK_NAV_BUTTON_PROVIDER_GTK_H_
-#define CHROME_BROWSER_UI_GTK_NAV_BUTTON_PROVIDER_GTK_H_
+#define UI_GTK_NAV_BUTTON_PROVIDER_GTK_H_
 
 #include <map>
 
@@ -41,4 +41,4 @@ class COMPONENT_EXPORT(GTK) NavButtonProviderGtk
 
 }  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_GTK_NAV_BUTTON_PROVIDER_GTK_H_
+#endif  // UI_GTK_NAV_BUTTON_PROVIDER_GTK_H_

ui/gtk/print_dialog_gtk.cc

@@ -2,7 +2,7 @@
 // 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/print_dialog_gtk.h"
+#include "ui/gtk/print_dialog_gtk.h"
 
 #include <gtk/gtkunixprint.h>
 
@@ -24,14 +24,14 @@
 #include "base/task/thread_pool.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/values.h"
-#include "chrome/browser/ui/gtk/gtk_ui.h"
-#include "chrome/browser/ui/gtk/gtk_util.h"
-#include "chrome/browser/ui/gtk/printing_gtk_util.h"
 #include "printing/metafile.h"
 #include "printing/print_job_constants.h"
 #include "printing/print_settings.h"
 #include "ui/aura/window.h"
+#include "ui/gtk/gtk_ui.h"
 #include "ui/gtk/gtk_ui_delegate.h"
+#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/printing_gtk_util.h"
 
 using printing::PageRanges;
 using printing::PrintSettings;

ui/gtk/print_dialog_gtk.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_PRINT_DIALOG_GTK_H_
+#ifndef UI_GTK_PRINT_DIALOG_GTK_H_
-#define CHROME_BROWSER_UI_GTK_PRINT_DIALOG_GTK_H_
+#define UI_GTK_PRINT_DIALOG_GTK_H_
 
 #include <gtk/gtk.h>
 #include <gtk/gtkunixprint.h>
@@ -89,4 +89,4 @@ class PrintDialogGtk : public printing::PrintDialogGtkInterface,
   DISALLOW_COPY_AND_ASSIGN(PrintDialogGtk);
 };
 
-#endif  // CHROME_BROWSER_UI_GTK_PRINT_DIALOG_GTK_H_
+#endif  // UI_GTK_PRINT_DIALOG_GTK_H_

ui/gtk/printing_gtk_util.cc

@@ -2,7 +2,7 @@
 // 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/printing_gtk_util.h"
+#include "ui/gtk/printing_gtk_util.h"
 
 #include <gtk/gtk.h>
 #include <gtk/gtkunixprint.h>

ui/gtk/printing_gtk_util.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_PRINTING_GTK_UTIL_H_
+#ifndef UI_GTK_PRINTING_GTK_UTIL_H_
-#define CHROME_BROWSER_UI_GTK_PRINTING_GTK_UTIL_H_
+#define UI_GTK_PRINTING_GTK_UTIL_H_
 
 #include "ui/gfx/geometry/size.h"
 
@@ -24,4 +24,4 @@ void InitPrintSettingsGtk(GtkPrintSettings* settings,
                           GtkPageSetup* page_setup,
                           printing::PrintSettings* print_settings);
 
-#endif  // CHROME_BROWSER_UI_GTK_PRINTING_GTK_UTIL_H_
+#endif  // UI_GTK_PRINTING_GTK_UTIL_H_

ui/gtk/select_file_dialog_impl.cc

@@ -4,7 +4,7 @@
 //
 // This file implements common select dialog functionality between GTK and KDE.
 
-#include "chrome/browser/ui/gtk/select_file_dialog_impl.h"
+#include "ui/gtk/select_file_dialog_impl.h"
 
 #include "base/environment.h"
 #include "base/files/file_util.h"

ui/gtk/select_file_dialog_impl.h

@@ -4,8 +4,8 @@
 //
 // This file implements common select dialog functionality between GTK and KDE.
 
-#ifndef CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_H_
+#ifndef UI_GTK_SELECT_FILE_DIALOG_IMPL_H_
-#define CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_H_
+#define UI_GTK_SELECT_FILE_DIALOG_IMPL_H_
 
 #include <stddef.h>
 
@@ -88,4 +88,4 @@ class SelectFileDialogImpl : public ui::SelectFileDialog {
 
 }  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_H_
+#endif  // UI_GTK_SELECT_FILE_DIALOG_IMPL_H_

ui/gtk/select_file_dialog_impl_gtk.cc

@@ -2,7 +2,7 @@
 // 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/select_file_dialog_impl_gtk.h"
+#include "ui/gtk/select_file_dialog_impl_gtk.h"
 
 #include <gtk/gtk.h>
 #include <stddef.h>
@@ -22,12 +22,12 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/ui/gtk/gtk_ui.h"
-#include "chrome/browser/ui/gtk/gtk_util.h"
-#include "chrome/browser/ui/gtk/select_file_dialog_impl.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gtk/gtk_ui.h"
 #include "ui/gtk/gtk_ui_delegate.h"
+#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/select_file_dialog_impl.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"

ui/gtk/select_file_dialog_impl_gtk.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_GTK_H_
+#ifndef UI_GTK_SELECT_FILE_DIALOG_IMPL_GTK_H_
-#define CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_GTK_H_
+#define UI_GTK_SELECT_FILE_DIALOG_IMPL_GTK_H_
 
 #include "base/macros.h"
-#include "chrome/browser/ui/gtk/gtk_util.h"
-#include "chrome/browser/ui/gtk/select_file_dialog_impl.h"
 #include "ui/base/glib/glib_signal.h"
+#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/select_file_dialog_impl.h"
 
 namespace gtk {
 
@@ -145,4 +145,4 @@ class SelectFileDialogImplGTK : public SelectFileDialogImpl,
 
 }  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_GTK_H_
+#endif  // UI_GTK_SELECT_FILE_DIALOG_IMPL_GTK_H_

ui/gtk/select_file_dialog_impl_kde.cc

@@ -25,10 +25,10 @@
 #include "base/task/task_traits.h"
 #include "base/task/thread_pool.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/ui/gtk/select_file_dialog_impl.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/x/x11.h"
+#include "ui/gtk/select_file_dialog_impl.h"
 #include "ui/strings/grit/ui_strings.h"
 
 namespace {

ui/gtk/settings_provider.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_H_
+#ifndef UI_GTK_SETTINGS_PROVIDER_H_
-#define CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_H_
+#define UI_GTK_SETTINGS_PROVIDER_H_
 
 namespace gtk {
 
@@ -23,4 +23,4 @@ class SettingsProvider {
 
 }  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_H_
+#endif  // UI_GTK_SETTINGS_PROVIDER_H_

ui/gtk/settings_provider_gsettings.cc

@@ -2,7 +2,7 @@
 // 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/settings_provider_gsettings.h"
+#include "ui/gtk/settings_provider_gsettings.h"
 
 #include <gio/gio.h>
 
@@ -10,8 +10,8 @@
 
 #include "base/environment.h"
 #include "base/nix/xdg_util.h"
-#include "chrome/browser/ui/gtk/gtk_ui.h"
+#include "ui/gtk/gtk_ui.h"
-#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "ui/gtk/gtk_util.h"
 
 namespace {
 

ui/gtk/settings_provider_gsettings.h

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_GSETTINGS_H_
+#ifndef UI_GTK_SETTINGS_PROVIDER_GSETTINGS_H_
-#define CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_GSETTINGS_H_
+#define UI_GTK_SETTINGS_PROVIDER_GSETTINGS_H_
 
 #include <gio/gio.h>
 
 #include <string>
 
 #include "base/macros.h"
-#include "chrome/browser/ui/gtk/settings_provider.h"
 #include "ui/base/glib/glib_signal.h"
+#include "ui/gtk/settings_provider.h"
 
 namespace gtk {
 class GtkUi;
@@ -54,4 +54,4 @@ class SettingsProviderGSettings : public SettingsProvider {
 
 }  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_GSETTINGS_H_
+#endif  // UI_GTK_SETTINGS_PROVIDER_GSETTINGS_H_

ui/gtk/settings_provider_gtk.cc

@@ -2,11 +2,11 @@
 // 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/settings_provider_gtk.h"
+#include "ui/gtk/settings_provider_gtk.h"
 
 #include "base/strings/string_split.h"
-#include "chrome/browser/ui/gtk/gtk_ui.h"
+#include "ui/gtk/gtk_ui.h"
-#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "ui/gtk/gtk_util.h"
 
 namespace gtk {
 

ui/gtk/settings_provider_gtk.h

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_GTK_H_
+#ifndef UI_GTK_SETTINGS_PROVIDER_GTK_H_
-#define CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_GTK_H_
+#define UI_GTK_SETTINGS_PROVIDER_GTK_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
-#include "chrome/browser/ui/gtk/settings_provider.h"
 #include "ui/base/glib/glib_signal.h"
+#include "ui/gtk/settings_provider.h"
 #include "ui/views/linux_ui/linux_ui.h"
 
 typedef struct _GParamSpec GParamSpec;
@@ -78,4 +78,4 @@ class SettingsProviderGtk : public SettingsProvider {
 
 }  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_GTK_H_
+#endif  // UI_GTK_SETTINGS_PROVIDER_GTK_H_

ui/ozone/platform/wayland/BUILD.gn

@@ -170,7 +170,10 @@ source_set("wayland") {
       "host/gtk_ui_delegate_wayland.cc",
       "host/gtk_ui_delegate_wayland.h",
     ]
-    deps += [ "//ui/gtk" ]
+    deps += [
+      "//build/config/linux/gtk",
+      "//ui/gtk:gtk_ui_delegate",
+    ]
   }
 
   defines = [ "OZONE_IMPLEMENTATION" ]