diff --git a/build/config/linux/gtk/BUILD.gn b/build/config/linux/gtk/BUILD.gn
index d78f7407c179fe..a58b089869b7db 100644
--- a/build/config/linux/gtk/BUILD.gn
+++ b/build/config/linux/gtk/BUILD.gn
@@ -36,7 +36,7 @@ group("gtk") {
     "//remoting/host:remoting_me2me_host_static",
     "//remoting/test:it2me_standalone_host_main",
     "//webrtc/examples:peerconnection_client",
-    "//chrome/browser/ui/libgtkui:*",
+    "//chrome/browser/ui/gtk:*",
   ]
 
   public_configs = [ ":gtk_internal_config" ]
@@ -48,6 +48,6 @@ pkg_config("gtkprint_internal_config") {
 }
 
 group("gtkprint") {
-  visibility = [ "//chrome/browser/ui/libgtkui:*" ]
+  visibility = [ "//chrome/browser/ui/gtk:*" ]
   public_configs = [ ":gtkprint_internal_config" ]
 }
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index f6d0089f621ea7..64b88be9ad1ec2 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4333,7 +4333,7 @@ jumbo_static_library("browser") {
       "//ui/snapshot",
     ]
     if (use_gtk) {
-      deps += [ "//chrome/browser/ui/libgtkui" ]
+      deps += [ "//chrome/browser/ui/gtk" ]
     }
   }
 
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 9c7b7a5741e09d..771220caeb6afe 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2600,7 +2600,7 @@ jumbo_static_library("ui") {
     }
     if (use_gtk) {
       # This is the only component that can interact with gtk.
-      deps += [ "//chrome/browser/ui/libgtkui" ]
+      deps += [ "//chrome/browser/ui/gtk" ]
     }
   }
 
@@ -3455,7 +3455,7 @@ jumbo_static_library("ui") {
           sources += [ "views/linux_ui/linux_ui_factory_gtk.cc" ]
 
           # This is the only component that can interact with gtk.
-          deps += [ "//chrome/browser/ui/libgtkui" ]
+          deps += [ "//chrome/browser/ui/gtk" ]
         } else {
           sources += [ "views/linux_ui/linux_ui_factory.cc" ]
         }
diff --git a/chrome/browser/ui/libgtkui/BUILD.gn b/chrome/browser/ui/gtk/BUILD.gn
similarity index 97%
rename from chrome/browser/ui/libgtkui/BUILD.gn
rename to chrome/browser/ui/gtk/BUILD.gn
index 7b202895103895..6b4cbfe2b82cb3 100644
--- a/chrome/browser/ui/libgtkui/BUILD.gn
+++ b/chrome/browser/ui/gtk/BUILD.gn
@@ -10,7 +10,7 @@ import("//build/config/linux/gtk/gtk.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//ui/ozone/ozone.gni")
 
-jumbo_component("libgtkui") {
+jumbo_component("gtk") {
   sources = [
     "gtk_key_bindings_handler.cc",
     "gtk_key_bindings_handler.h",
@@ -52,7 +52,7 @@ jumbo_component("libgtkui") {
     configs += [ "//printing:cups" ]
   }
 
-  defines = [ "IS_LIBGTKUI_IMPL" ]
+  defines = [ "IS_GTK_IMPL" ]
 
   deps = [
     "//base",
diff --git a/chrome/browser/ui/libgtkui/DEPS b/chrome/browser/ui/gtk/DEPS
similarity index 100%
rename from chrome/browser/ui/libgtkui/DEPS
rename to chrome/browser/ui/gtk/DEPS
diff --git a/chrome/browser/ui/libgtkui/OWNERS b/chrome/browser/ui/gtk/OWNERS
similarity index 100%
rename from chrome/browser/ui/libgtkui/OWNERS
rename to chrome/browser/ui/gtk/OWNERS
diff --git a/chrome/browser/ui/libgtkui/gtk_event_loop_x11.cc b/chrome/browser/ui/gtk/gtk_event_loop_x11.cc
similarity index 94%
rename from chrome/browser/ui/libgtkui/gtk_event_loop_x11.cc
rename to chrome/browser/ui/gtk/gtk_event_loop_x11.cc
index 96106effbf1b47..133984b46c8deb 100644
--- a/chrome/browser/ui/libgtkui/gtk_event_loop_x11.cc
+++ b/chrome/browser/ui/gtk/gtk_event_loop_x11.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/libgtkui/gtk_event_loop_x11.h"
+#include "chrome/browser/ui/gtk/gtk_event_loop_x11.h"
 
 #include "ui/gfx/x/x11.h"
 
@@ -11,11 +11,11 @@
 #include <gtk/gtk.h>
 
 #include "base/memory/singleton.h"
-#include "chrome/browser/ui/libgtkui/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "ui/events/platform/x11/x11_event_source.h"
 #include "ui/gfx/x/x11_types.h"
 
-namespace libgtkui {
+namespace gtk {
 
 // static
 GtkEventLoopX11* GtkEventLoopX11::GetInstance() {
@@ -83,4 +83,4 @@ void GtkEventLoopX11::ProcessGdkEventKey(const GdkEventKey& gdk_event_key) {
     XPutBackEvent(x_event.xkey.display, &x_event);
 }
 
-}  // namespace libgtkui
+}  // namespace gtk
diff --git a/chrome/browser/ui/libgtkui/gtk_event_loop_x11.h b/chrome/browser/ui/gtk/gtk_event_loop_x11.h
similarity index 77%
rename from chrome/browser/ui/libgtkui/gtk_event_loop_x11.h
rename to chrome/browser/ui/gtk/gtk_event_loop_x11.h
index 9b97ac6f5ef972..9e785390770539 100644
--- a/chrome/browser/ui/libgtkui/gtk_event_loop_x11.h
+++ b/chrome/browser/ui/gtk/gtk_event_loop_x11.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_LIBGTKUI_GTK_EVENT_LOOP_X11_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_GTK_EVENT_LOOP_X11_H_
+#ifndef CHROME_BROWSER_UI_GTK_GTK_EVENT_LOOP_X11_H_
+#define CHROME_BROWSER_UI_GTK_GTK_EVENT_LOOP_X11_H_
 
 #include "base/macros.h"
 #include "ui/base/glib/glib_integers.h"
@@ -16,7 +16,7 @@ template <typename Type>
 struct DefaultSingletonTraits;
 }
 
-namespace libgtkui {
+namespace gtk {
 
 class GtkEventLoopX11 {
  public:
@@ -34,6 +34,6 @@ class GtkEventLoopX11 {
   DISALLOW_COPY_AND_ASSIGN(GtkEventLoopX11);
 };
 
-}  // namespace libgtkui
+}  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_GTK_EVENT_LOOP_X11_H_
+#endif  // CHROME_BROWSER_UI_GTK_GTK_EVENT_LOOP_X11_H_
diff --git a/chrome/browser/ui/libgtkui/gtk_key_bindings_handler.cc b/chrome/browser/ui/gtk/gtk_key_bindings_handler.cc
similarity index 97%
rename from chrome/browser/ui/libgtkui/gtk_key_bindings_handler.cc
rename to chrome/browser/ui/gtk/gtk_key_bindings_handler.cc
index d63bdcb6ada5bb..b65938b48a86be 100644
--- a/chrome/browser/ui/libgtkui/gtk_key_bindings_handler.cc
+++ b/chrome/browser/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/libgtkui/gtk_key_bindings_handler.h"
+#include "chrome/browser/ui/gtk/gtk_key_bindings_handler.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <stddef.h>
@@ -12,7 +12,7 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/ui/libgtkui/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "ui/base/ime/text_edit_commands.h"
 #include "ui/events/event.h"
@@ -23,7 +23,7 @@ using ui::TextEditCommand;
 // in a state that links. This code was adapted from the content layer GTK
 // code, which had some simple unit tests. However, the changes in the public
 // interface basically meant the tests need to be rewritten; this imposes weird
-// linking requirements regarding GTK+ as we don't have a libgtkui_unittests
+// linking requirements regarding GTK+ as we don't have a gtk_unittests
 // yet. http://crbug.com/358297.
 
 namespace {
@@ -38,7 +38,7 @@ GtkWidget* CreateInvisibleWindow() {
 
 }  // namespace
 
-namespace libgtkui {
+namespace gtk {
 
 GtkKeyBindingsHandler::GtkKeyBindingsHandler()
     : fake_window_(CreateInvisibleWindow()), handler_(CreateNewHandler()) {
@@ -185,7 +185,8 @@ void GtkKeyBindingsHandler::DeleteFromCursor(GtkTextView* text_view,
     return;
 
   TextEditCommand commands[2] = {
-      TextEditCommand::INVALID_COMMAND, TextEditCommand::INVALID_COMMAND,
+      TextEditCommand::INVALID_COMMAND,
+      TextEditCommand::INVALID_COMMAND,
   };
   switch (type) {
     case GTK_DELETE_CHARS:
@@ -395,4 +396,4 @@ void GtkKeyBindingsHandler::MoveFocus(GtkWidget* widget,
   // Just for disabling the default handler.
 }
 
-}  // namespace libgtkui
+}  // namespace gtk
diff --git a/chrome/browser/ui/libgtkui/gtk_key_bindings_handler.h b/chrome/browser/ui/gtk/gtk_key_bindings_handler.h
similarity index 95%
rename from chrome/browser/ui/libgtkui/gtk_key_bindings_handler.h
rename to chrome/browser/ui/gtk/gtk_key_bindings_handler.h
index bb370736298ee1..ebe6f3131dbd13 100644
--- a/chrome/browser/ui/libgtkui/gtk_key_bindings_handler.h
+++ b/chrome/browser/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_LIBGTKUI_GTK_KEY_BINDINGS_HANDLER_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_GTK_KEY_BINDINGS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_GTK_GTK_KEY_BINDINGS_HANDLER_H_
+#define CHROME_BROWSER_UI_GTK_GTK_KEY_BINDINGS_HANDLER_H_
 
 #include <gtk/gtk.h>
 
@@ -17,7 +17,7 @@ namespace ui {
 class Event;
 }
 
-namespace libgtkui {
+namespace gtk {
 
 // This class is a convenience class for handling editor key bindings defined
 // in gtk keyboard theme.
@@ -137,6 +137,6 @@ class GtkKeyBindingsHandler {
   std::vector<ui::TextEditCommandAuraLinux> edit_commands_;
 };
 
-}  // namespace libgtkui
+}  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_GTK_KEY_BINDINGS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_GTK_GTK_KEY_BINDINGS_HANDLER_H_
diff --git a/chrome/browser/ui/libgtkui/gtk_ui.cc b/chrome/browser/ui/gtk/gtk_ui.cc
similarity index 97%
rename from chrome/browser/ui/libgtkui/gtk_ui.cc
rename to chrome/browser/ui/gtk/gtk_ui.cc
index e84296d0a28644..8b9af0a354baea 100644
--- a/chrome/browser/ui/libgtkui/gtk_ui.cc
+++ b/chrome/browser/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/libgtkui/gtk_ui.h"
+#include "chrome/browser/ui/gtk/gtk_ui.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
@@ -23,15 +23,15 @@
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/themes/theme_properties.h"
-#include "chrome/browser/ui/libgtkui/gtk_key_bindings_handler.h"
-#include "chrome/browser/ui/libgtkui/gtk_util.h"
-#include "chrome/browser/ui/libgtkui/input_method_context_impl_gtk.h"
-#include "chrome/browser/ui/libgtkui/native_theme_gtk.h"
-#include "chrome/browser/ui/libgtkui/nav_button_provider_gtk.h"
-#include "chrome/browser/ui/libgtkui/print_dialog_gtk.h"
-#include "chrome/browser/ui/libgtkui/printing_gtk_util.h"
-#include "chrome/browser/ui/libgtkui/select_file_dialog_impl.h"
-#include "chrome/browser/ui/libgtkui/settings_provider_gtk.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 "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "printing/buildflags/buildflags.h"
@@ -64,11 +64,11 @@
 #include "ui/views/linux_ui/window_button_order_observer.h"
 
 #if defined(USE_GIO)
-#include "chrome/browser/ui/libgtkui/settings_provider_gsettings.h"
+#include "chrome/browser/ui/gtk/settings_provider_gsettings.h"
 #endif
 
 #if defined(USE_GTK_EVENT_LOOP_X11)
-#include "chrome/browser/ui/libgtkui/gtk_event_loop_x11.h"
+#include "chrome/browser/ui/gtk/gtk_event_loop_x11.h"
 #endif
 
 #if defined(USE_X11)
@@ -86,7 +86,7 @@
 #include "chrome/browser/ui/views/nav_button_provider.h"
 #endif
 
-namespace libgtkui {
+namespace gtk {
 
 namespace {
 
@@ -685,8 +685,7 @@ void GtkUi::SetWindowFrameAction(WindowFrameActionSource source,
 std::unique_ptr<ui::LinuxInputMethodContext> GtkUi::CreateInputMethodContext(
     ui::LinuxInputMethodContextDelegate* delegate,
     bool is_simple) const {
-  return std::unique_ptr<ui::LinuxInputMethodContext>(
-      new InputMethodContextImplGtk(delegate, is_simple));
+  return std::make_unique<InputMethodContextImplGtk>(delegate, is_simple);
 }
 
 gfx::FontRenderParams GtkUi::GetDefaultFontRenderParams() const {
@@ -750,7 +749,7 @@ bool GtkUi::AnimationsEnabled() const {
 #if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS)
 std::unique_ptr<views::NavButtonProvider> GtkUi::CreateNavButtonProvider() {
   if (GtkVersionCheck(3, 14))
-    return std::make_unique<libgtkui::NavButtonProviderGtk>();
+    return std::make_unique<gtk::NavButtonProviderGtk>();
   return nullptr;
 }
 #endif
@@ -1121,8 +1120,8 @@ float GtkUi::GetDeviceScaleFactor() const {
   return device_scale_factor_;
 }
 
-}  // namespace libgtkui
+}  // namespace gtk
 
 views::LinuxUI* BuildGtkUi() {
-  return new libgtkui::GtkUi;
+  return new gtk::GtkUi;
 }
diff --git a/chrome/browser/ui/libgtkui/gtk_ui.h b/chrome/browser/ui/gtk/gtk_ui.h
similarity index 96%
rename from chrome/browser/ui/libgtkui/gtk_ui.h
rename to chrome/browser/ui/gtk/gtk_ui.h
index d8647dc9f21b0e..73de1b731655fe 100644
--- a/chrome/browser/ui/libgtkui/gtk_ui.h
+++ b/chrome/browser/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_LIBGTKUI_GTK_UI_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_GTK_UI_H_
+#ifndef CHROME_BROWSER_UI_GTK_GTK_UI_H_
+#define CHROME_BROWSER_UI_GTK_GTK_UI_H_
 
 #include <map>
 #include <memory>
@@ -25,7 +25,7 @@ typedef struct _GtkSettings GtkSettings;
 typedef struct _GtkStyle GtkStyle;
 typedef struct _GtkWidget GtkWidget;
 
-namespace libgtkui {
+namespace gtk {
 using ColorMap = std::map<int, SkColor>;
 
 class GtkKeyBindingsHandler;
@@ -212,9 +212,9 @@ class GtkUi : public views::LinuxUI {
   DISALLOW_COPY_AND_ASSIGN(GtkUi);
 };
 
-}  // namespace libgtkui
+}  // namespace gtk
 
 // Access point to the GTK desktop system.
-COMPONENT_EXPORT(LIBGTKUI) views::LinuxUI* BuildGtkUi();
+COMPONENT_EXPORT(GTK) views::LinuxUI* BuildGtkUi();
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_GTK_UI_H_
+#endif  // CHROME_BROWSER_UI_GTK_GTK_UI_H_
diff --git a/chrome/browser/ui/libgtkui/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc
similarity index 98%
rename from chrome/browser/ui/libgtkui/gtk_util.cc
rename to chrome/browser/ui/gtk/gtk_util.cc
index ad76fefa1caeac..2bd955b42932e6 100644
--- a/chrome/browser/ui/libgtkui/gtk_util.cc
+++ b/chrome/browser/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/libgtkui/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 
 #include <dlfcn.h>
 #include <gdk/gdk.h>
@@ -43,7 +43,7 @@ void CommonInitFromCommandLine(const base::CommandLine& command_line) {
   // Callers should have already called setlocale(LC_ALL, "") and
   // setlocale(LC_NUMERIC, "C") by now. Chrome does this in
   // service_manager::Main.
-  DCHECK_EQ(strcmp(setlocale(LC_NUMERIC, NULL), "C"), 0);
+  DCHECK_EQ(strcmp(setlocale(LC_NUMERIC, nullptr), "C"), 0);
   // This prevent GTK from calling setlocale(LC_ALL, ""), which potentially
   // overwrites the LC_NUMERIC locale to something other than "C".
   gtk_disable_setlocale();
@@ -52,7 +52,7 @@ void CommonInitFromCommandLine(const base::CommandLine& command_line) {
 #else
   const std::vector<std::string>& args = command_line.argv();
   int argc = args.size();
-  std::unique_ptr<char* []> argv(new char*[argc + 1]);
+  std::unique_ptr<char*[]> argv(new char*[argc + 1]);
   for (size_t i = 0; i < args.size(); ++i) {
     // TODO(piman@google.com): can gtk_init modify argv? Just being safe
     // here.
@@ -126,7 +126,7 @@ int GetKeyEventProperty(const ui::KeyEvent& key_event,
 
 }  // namespace
 
-namespace libgtkui {
+namespace gtk {
 
 // TODO(thomasanderson): ThemeService has a whole interface just for reading
 // default constants. Figure out what to do with that more long term; for now,
@@ -205,7 +205,7 @@ float GetDeviceScaleFactor() {
 
 void* GetGtkSharedLibrary() {
   std::string lib_name =
-      "libgtk-" + std::to_string(GTK_MAJOR_VERSION) + ".so.0";
+      "libgtk-" + base::NumberToString(GTK_MAJOR_VERSION) + ".so.0";
   static void* gtk_lib = dlopen(lib_name.c_str(), RTLD_LAZY);
   DCHECK(gtk_lib);
   return gtk_lib;
@@ -599,7 +599,7 @@ std::string GetGtkSettingsStringProperty(GtkSettings* settings,
 GdkDisplay* GetGdkDisplay() {
   GdkDisplay* display = nullptr;
   // TODO(crbug.com/1002674): Remove once GtkIM-based LinuxInputMethodContext
-  // implementation is moved out of libgtkui.
+  // implementation is moved out of gtk.
 #if defined(USE_X11)
   display = gdk_x11_lookup_xdisplay(gfx::GetXDisplay());
 #endif
@@ -647,4 +647,4 @@ GdkEvent* GdkEventFromKeyEvent(const ui::KeyEvent& key_event) {
   return gdk_event;
 }
 
-}  // namespace libgtkui
+}  // namespace gtk
diff --git a/chrome/browser/ui/libgtkui/gtk_util.h b/chrome/browser/ui/gtk/gtk_util.h
similarity index 94%
rename from chrome/browser/ui/libgtkui/gtk_util.h
rename to chrome/browser/ui/gtk/gtk_util.h
index ab8707407f80dd..e8f6a1bd938ab5 100644
--- a/chrome/browser/ui/libgtkui/gtk_util.h
+++ b/chrome/browser/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_LIBGTKUI_GTK_UTIL_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_GTK_UTIL_H_
+#ifndef CHROME_BROWSER_UI_GTK_GTK_UTIL_H_
+#define CHROME_BROWSER_UI_GTK_GTK_UTIL_H_
 
 #include <gtk/gtk.h>
 #include <string>
@@ -30,7 +30,7 @@ namespace ui {
 class KeyEvent;
 }
 
-namespace libgtkui {
+namespace gtk {
 
 extern const color_utils::HSL kDefaultTintFrameIncognito;
 
@@ -88,11 +88,11 @@ bool GtkVersionCheck(int major, int minor = 0, int micro = 0);
 using ScopedStyleContext = ScopedGObject<GtkStyleContext>;
 using ScopedCssProvider = ScopedGObject<GtkCssProvider>;
 
-}  // namespace libgtkui
+}  // namespace gtk
 
-// Template override cannot be in the libgtkui namespace.
+// Template override cannot be in the gtk namespace.
 template <>
-inline void libgtkui::ScopedStyleContext::Unref() {
+inline void gtk::ScopedStyleContext::Unref() {
   // Versions of GTK earlier than 3.15.4 had a bug where a g_assert
   // would be triggered when trying to free a GtkStyleContext that had
   // a parent whose only reference was the child context in question.
@@ -102,7 +102,7 @@ inline void libgtkui::ScopedStyleContext::Unref() {
   while (context) {
     GtkStyleContext* parent = gtk_style_context_get_parent(context);
     if (parent && G_OBJECT(context)->ref_count == 1 &&
-        !libgtkui::GtkVersionCheck(3, 15, 4)) {
+        !gtk::GtkVersionCheck(3, 15, 4)) {
       g_object_ref(parent);
       gtk_style_context_set_parent(context, nullptr);
       g_object_unref(context);
@@ -114,7 +114,7 @@ inline void libgtkui::ScopedStyleContext::Unref() {
   }
 }
 
-namespace libgtkui {
+namespace gtk {
 
 // Converts ui::NativeTheme::State to GtkStateFlags.
 GtkStateFlags StateToStateFlags(ui::NativeTheme::State state);
@@ -195,6 +195,6 @@ int BuildXkbStateFromGdkEvent(unsigned int state, unsigned char group);
 // root aura::Window targeted by that key event.
 GdkEvent* GdkEventFromKeyEvent(const ui::KeyEvent& key_event);
 
-}  // namespace libgtkui
+}  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_GTK_UTIL_H_
+#endif  // CHROME_BROWSER_UI_GTK_GTK_UTIL_H_
diff --git a/chrome/browser/ui/libgtkui/input_method_context_impl_gtk.cc b/chrome/browser/ui/gtk/input_method_context_impl_gtk.cc
similarity index 97%
rename from chrome/browser/ui/libgtkui/input_method_context_impl_gtk.cc
rename to chrome/browser/ui/gtk/input_method_context_impl_gtk.cc
index ac4f15dc4985d9..848f213b166709 100644
--- a/chrome/browser/ui/libgtkui/input_method_context_impl_gtk.cc
+++ b/chrome/browser/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/libgtkui/input_method_context_impl_gtk.h"
+#include "chrome/browser/ui/gtk/input_method_context_impl_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
@@ -11,7 +11,7 @@
 #include <stddef.h>
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ui/libgtkui/gtk_util.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"
@@ -20,7 +20,7 @@
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/views/linux_ui/linux_ui.h"
 
-namespace libgtkui {
+namespace gtk {
 
 namespace {
 
@@ -228,4 +228,4 @@ void InputMethodContextImplGtk::SetContextClientWindow(GdkWindow* window) {
   gdk_last_set_client_window_ = window;
 }
 
-}  // namespace libgtkui
+}  // namespace gtk
diff --git a/chrome/browser/ui/libgtkui/input_method_context_impl_gtk.h b/chrome/browser/ui/gtk/input_method_context_impl_gtk.h
similarity index 91%
rename from chrome/browser/ui/libgtkui/input_method_context_impl_gtk.h
rename to chrome/browser/ui/gtk/input_method_context_impl_gtk.h
index 366da929bbbe78..fc09a5b7937928 100644
--- a/chrome/browser/ui/libgtkui/input_method_context_impl_gtk.h
+++ b/chrome/browser/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_LIBGTKUI_INPUT_METHOD_CONTEXT_IMPL_GTK_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_INPUT_METHOD_CONTEXT_IMPL_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_INPUT_METHOD_CONTEXT_IMPL_GTK_H_
+#define CHROME_BROWSER_UI_GTK_INPUT_METHOD_CONTEXT_IMPL_GTK_H_
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
@@ -15,7 +15,7 @@
 typedef struct _GdkWindow GdkWindow;
 typedef struct _GtkIMContext GtkIMContext;
 
-namespace libgtkui {
+namespace gtk {
 
 // An implementation of LinuxInputMethodContext which uses GtkIMContext
 // (gtk-immodule) as a bridge from/to underlying IMEs.
@@ -79,6 +79,6 @@ class InputMethodContextImplGtk : public ui::LinuxInputMethodContext {
   DISALLOW_COPY_AND_ASSIGN(InputMethodContextImplGtk);
 };
 
-}  // namespace libgtkui
+}  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_INPUT_METHOD_CONTEXT_IMPL_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_INPUT_METHOD_CONTEXT_IMPL_GTK_H_
diff --git a/chrome/browser/ui/libgtkui/native_theme_gtk.cc b/chrome/browser/ui/gtk/native_theme_gtk.cc
similarity index 99%
rename from chrome/browser/ui/libgtkui/native_theme_gtk.cc
rename to chrome/browser/ui/gtk/native_theme_gtk.cc
index c34e3618c5124e..26f1842494bdbc 100644
--- a/chrome/browser/ui/libgtkui/native_theme_gtk.cc
+++ b/chrome/browser/ui/gtk/native_theme_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/libgtkui/native_theme_gtk.h"
+#include "chrome/browser/ui/gtk/native_theme_gtk.h"
 
 #include <gtk/gtk.h>
 
-#include "chrome/browser/ui/libgtkui/gtk_util.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"
@@ -14,7 +14,7 @@
 #include "ui/gfx/skia_util.h"
 #include "ui/native_theme/native_theme_dark_aura.h"
 
-namespace libgtkui {
+namespace gtk {
 
 namespace {
 
@@ -646,4 +646,4 @@ void NativeThemeGtk::PaintFrameTopArea(
                     rect.x(), rect.y());
 }
 
-}  // namespace libgtkui
+}  // namespace gtk
diff --git a/chrome/browser/ui/libgtkui/native_theme_gtk.h b/chrome/browser/ui/gtk/native_theme_gtk.h
similarity index 94%
rename from chrome/browser/ui/libgtkui/native_theme_gtk.h
rename to chrome/browser/ui/gtk/native_theme_gtk.h
index 302fbe895d0028..b52e5d65828cd5 100644
--- a/chrome/browser/ui/libgtkui/native_theme_gtk.h
+++ b/chrome/browser/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_LIBGTKUI_NATIVE_THEME_GTK_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_NATIVE_THEME_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_NATIVE_THEME_GTK_H_
+#define CHROME_BROWSER_UI_GTK_NATIVE_THEME_GTK_H_
 
 #include "base/macros.h"
 #include "base/no_destructor.h"
@@ -16,7 +16,7 @@ typedef struct _GtkCssProvider GtkCssProvider;
 typedef struct _GtkParamSpec GtkParamSpec;
 typedef struct _GtkSettings GtkSettings;
 
-namespace libgtkui {
+namespace gtk {
 
 using ScopedCssProvider = ScopedGObject<GtkCssProvider>;
 
@@ -89,6 +89,6 @@ class NativeThemeGtk : public ui::NativeThemeBase {
   DISALLOW_COPY_AND_ASSIGN(NativeThemeGtk);
 };
 
-}  // namespace libgtkui
+}  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_NATIVE_THEME_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_NATIVE_THEME_GTK_H_
diff --git a/chrome/browser/ui/libgtkui/nav_button_provider_gtk.cc b/chrome/browser/ui/gtk/nav_button_provider_gtk.cc
similarity index 99%
rename from chrome/browser/ui/libgtkui/nav_button_provider_gtk.cc
rename to chrome/browser/ui/gtk/nav_button_provider_gtk.cc
index 9652018aa3d7aa..fb0e485e72b9d6 100644
--- a/chrome/browser/ui/libgtkui/nav_button_provider_gtk.cc
+++ b/chrome/browser/ui/gtk/nav_button_provider_gtk.cc
@@ -2,17 +2,17 @@
 // 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/nav_button_provider_gtk.h"
+#include "chrome/browser/ui/gtk/nav_button_provider_gtk.h"
 
 #include <gtk/gtk.h>
 
-#include "chrome/browser/ui/libgtkui/gtk_util.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/views/widget/widget.h"
 
-namespace libgtkui {
+namespace gtk {
 
 namespace {
 
@@ -409,4 +409,4 @@ int NavButtonProviderGtk::GetInterNavButtonSpacing() const {
   return inter_button_spacing_;
 }
 
-}  // namespace libgtkui
+}  // namespace gtk
diff --git a/chrome/browser/ui/libgtkui/nav_button_provider_gtk.h b/chrome/browser/ui/gtk/nav_button_provider_gtk.h
similarity index 81%
rename from chrome/browser/ui/libgtkui/nav_button_provider_gtk.h
rename to chrome/browser/ui/gtk/nav_button_provider_gtk.h
index b878728afd48df..e7692c33ad403f 100644
--- a/chrome/browser/ui/libgtkui/nav_button_provider_gtk.h
+++ b/chrome/browser/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_LIBGTKUI_NAV_BUTTON_PROVIDER_GTK_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_NAV_BUTTON_PROVIDER_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_NAV_BUTTON_PROVIDER_GTK_H_
+#define CHROME_BROWSER_UI_GTK_NAV_BUTTON_PROVIDER_GTK_H_
 
 #include <map>
 
@@ -13,9 +13,9 @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/button.h"
 
-namespace libgtkui {
+namespace gtk {
 
-class COMPONENT_EXPORT(LIBGTKUI) NavButtonProviderGtk
+class COMPONENT_EXPORT(GTK) NavButtonProviderGtk
     : public views::NavButtonProvider {
  public:
   NavButtonProviderGtk();
@@ -39,6 +39,6 @@ class COMPONENT_EXPORT(LIBGTKUI) NavButtonProviderGtk
   int inter_button_spacing_;
 };
 
-}  // namespace libgtkui
+}  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_NAV_BUTTON_PROVIDER_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_NAV_BUTTON_PROVIDER_GTK_H_
diff --git a/chrome/browser/ui/libgtkui/print_dialog_gtk.cc b/chrome/browser/ui/gtk/print_dialog_gtk.cc
similarity index 96%
rename from chrome/browser/ui/libgtkui/print_dialog_gtk.cc
rename to chrome/browser/ui/gtk/print_dialog_gtk.cc
index 93b3e514b585ce..bdbba42dbc3897 100644
--- a/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
+++ b/chrome/browser/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/libgtkui/print_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/print_dialog_gtk.h"
 
 #include <gtk/gtkunixprint.h>
 
@@ -21,8 +21,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
 #include "base/values.h"
-#include "chrome/browser/ui/libgtkui/gtk_util.h"
-#include "chrome/browser/ui/libgtkui/printing_gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/printing_gtk_util.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "printing/metafile.h"
 #include "printing/print_job_constants.h"
@@ -183,10 +183,10 @@ PrintDialogGtk::~PrintDialogGtk() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (dialog_) {
-    aura::Window* parent = libgtkui::GetAuraTransientParent(dialog_);
+    aura::Window* parent = gtk::GetAuraTransientParent(dialog_);
     if (parent) {
       parent->RemoveObserver(this);
-      libgtkui::ClearAuraTransientParent(dialog_);
+      gtk::ClearAuraTransientParent(dialog_);
     }
     gtk_widget_destroy(dialog_);
     dialog_ = nullptr;
@@ -316,7 +316,7 @@ void PrintDialogGtk::ShowDialog(
   DCHECK(callback_);
 
   dialog_ = gtk_print_unix_dialog_new(nullptr, nullptr);
-  libgtkui::SetGtkTransientForAura(dialog_, parent_view);
+  gtk::SetGtkTransientForAura(dialog_, parent_view);
   if (parent_view)
     parent_view->AddObserver(this);
   g_signal_connect(dialog_, "delete-event",
@@ -336,10 +336,8 @@ void PrintDialogGtk::ShowDialog(
   // Since we only generate PDF, only show printers that support PDF.
   // TODO(thestig) Add more capabilities to support?
   GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
-      GTK_PRINT_CAPABILITY_GENERATE_PDF |
-      GTK_PRINT_CAPABILITY_PAGE_SET |
-      GTK_PRINT_CAPABILITY_COPIES |
-      GTK_PRINT_CAPABILITY_COLLATE |
+      GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET |
+      GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE |
       GTK_PRINT_CAPABILITY_REVERSE);
   gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(dialog_),
                                                 cap);
@@ -478,14 +476,15 @@ void PrintDialogGtk::OnResponse(GtkWidget* dialog, int response_id) {
       return;
     }
     case GTK_RESPONSE_APPLY:
-    default: { NOTREACHED(); }
+    default: {
+      NOTREACHED();
+    }
   }
 }
 
 static void OnJobCompletedThunk(GtkPrintJob* print_job,
                                 gpointer user_data,
-                                const GError* error
-                                ) {
+                                const GError* error) {
   static_cast<PrintDialogGtk*>(user_data)->OnJobCompleted(print_job, error);
 }
 void PrintDialogGtk::SendDocumentToPrinter(
@@ -535,9 +534,9 @@ void PrintDialogGtk::InitPrintSettings(
 }
 
 void PrintDialogGtk::OnWindowDestroying(aura::Window* window) {
-  DCHECK_EQ(libgtkui::GetAuraTransientParent(dialog_), window);
+  DCHECK_EQ(gtk::GetAuraTransientParent(dialog_), window);
 
-  libgtkui::ClearAuraTransientParent(dialog_);
+  gtk::ClearAuraTransientParent(dialog_);
   window->RemoveObserver(this);
   if (callback_)
     std::move(callback_).Run(PrintingContextLinux::CANCEL);
diff --git a/chrome/browser/ui/libgtkui/print_dialog_gtk.h b/chrome/browser/ui/gtk/print_dialog_gtk.h
similarity index 94%
rename from chrome/browser/ui/libgtkui/print_dialog_gtk.h
rename to chrome/browser/ui/gtk/print_dialog_gtk.h
index 2522b8c9863049..6c699061b5ea4d 100644
--- a/chrome/browser/ui/libgtkui/print_dialog_gtk.h
+++ b/chrome/browser/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_LIBGTKUI_PRINT_DIALOG_GTK_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_PRINT_DIALOG_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_PRINT_DIALOG_GTK_H_
+#define CHROME_BROWSER_UI_GTK_PRINT_DIALOG_GTK_H_
 
 #include <gtk/gtk.h>
 #include <gtk/gtkunixprint.h>
@@ -23,7 +23,7 @@
 namespace printing {
 class MetafilePlayer;
 class PrintSettings;
-}
+}  // namespace printing
 
 using printing::PrintingContextLinux;
 
@@ -91,4 +91,4 @@ class PrintDialogGtk : public printing::PrintDialogGtkInterface,
   DISALLOW_COPY_AND_ASSIGN(PrintDialogGtk);
 };
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_PRINT_DIALOG_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_PRINT_DIALOG_GTK_H_
diff --git a/chrome/browser/ui/libgtkui/printing_gtk_util.cc b/chrome/browser/ui/gtk/printing_gtk_util.cc
similarity index 98%
rename from chrome/browser/ui/libgtkui/printing_gtk_util.cc
rename to chrome/browser/ui/gtk/printing_gtk_util.cc
index 7baba3c622e20c..11abf17472d545 100644
--- a/chrome/browser/ui/libgtkui/printing_gtk_util.cc
+++ b/chrome/browser/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/libgtkui/printing_gtk_util.h"
+#include "chrome/browser/ui/gtk/printing_gtk_util.h"
 
 #include <gtk/gtk.h>
 #include <gtk/gtkunixprint.h>
diff --git a/chrome/browser/ui/libgtkui/printing_gtk_util.h b/chrome/browser/ui/gtk/printing_gtk_util.h
similarity index 80%
rename from chrome/browser/ui/libgtkui/printing_gtk_util.h
rename to chrome/browser/ui/gtk/printing_gtk_util.h
index 31b3df20ddc54a..16b5391885944b 100644
--- a/chrome/browser/ui/libgtkui/printing_gtk_util.h
+++ b/chrome/browser/ui/gtk/printing_gtk_util.h
@@ -2,15 +2,15 @@
 // 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_PRINTING_GTK_UTIL_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_PRINTING_GTK_UTIL_H_
+#ifndef CHROME_BROWSER_UI_GTK_PRINTING_GTK_UTIL_H_
+#define CHROME_BROWSER_UI_GTK_PRINTING_GTK_UTIL_H_
 
 #include "ui/gfx/geometry/size.h"
 
 namespace printing {
 class PrintingContextLinux;
 class PrintSettings;
-}
+}  // namespace printing
 
 typedef struct _GtkPrintSettings GtkPrintSettings;
 typedef struct _GtkPageSetup GtkPageSetup;
@@ -24,4 +24,4 @@ void InitPrintSettingsGtk(GtkPrintSettings* settings,
                           GtkPageSetup* page_setup,
                           printing::PrintSettings* print_settings);
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_PRINTING_GTK_UTIL_H_
+#endif  // CHROME_BROWSER_UI_GTK_PRINTING_GTK_UTIL_H_
diff --git a/chrome/browser/ui/libgtkui/select_file_dialog_impl.cc b/chrome/browser/ui/gtk/select_file_dialog_impl.cc
similarity index 92%
rename from chrome/browser/ui/libgtkui/select_file_dialog_impl.cc
rename to chrome/browser/ui/gtk/select_file_dialog_impl.cc
index c7e2fc99987529..570fe9d9e82e7b 100644
--- a/chrome/browser/ui/libgtkui/select_file_dialog_impl.cc
+++ b/chrome/browser/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/libgtkui/select_file_dialog_impl.h"
+#include "chrome/browser/ui/gtk/select_file_dialog_impl.h"
 
 #include "base/environment.h"
 #include "base/files/file_util.h"
@@ -16,17 +16,13 @@ using content::BrowserThread;
 
 namespace {
 
-enum UseKdeFileDialogStatus {
-  UNKNOWN,
-  NO_KDE,
-  YES_KDE
-};
+enum UseKdeFileDialogStatus { UNKNOWN, NO_KDE, YES_KDE };
 
 UseKdeFileDialogStatus use_kde_ = UNKNOWN;
 
 }  // namespace
 
-namespace libgtkui {
+namespace gtk {
 
 base::FilePath* SelectFileDialogImpl::last_saved_path_ = nullptr;
 base::FilePath* SelectFileDialogImpl::last_opened_path_ = nullptr;
@@ -81,7 +77,7 @@ SelectFileDialogImpl::SelectFileDialogImpl(
   }
 }
 
-SelectFileDialogImpl::~SelectFileDialogImpl() { }
+SelectFileDialogImpl::~SelectFileDialogImpl() {}
 
 void SelectFileDialogImpl::ListenerDestroyed() {
   listener_ = nullptr;
@@ -93,4 +89,4 @@ bool SelectFileDialogImpl::CallDirectoryExistsOnUIThread(
   return base::DirectoryExists(path);
 }
 
-}  // namespace libgtkui
+}  // namespace gtk
diff --git a/chrome/browser/ui/libgtkui/select_file_dialog_impl.h b/chrome/browser/ui/gtk/select_file_dialog_impl.h
similarity index 92%
rename from chrome/browser/ui/libgtkui/select_file_dialog_impl.h
rename to chrome/browser/ui/gtk/select_file_dialog_impl.h
index bf5a4a7b4cead8..273c22ebfb154c 100644
--- a/chrome/browser/ui/libgtkui/select_file_dialog_impl.h
+++ b/chrome/browser/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_LIBGTKUI_SELECT_FILE_DIALOG_IMPL_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_SELECT_FILE_DIALOG_IMPL_H_
+#ifndef CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_H_
+#define CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_H_
 
 #include <stddef.h>
 
@@ -19,7 +19,7 @@
 #include "ui/shell_dialogs/select_file_dialog.h"
 #include "ui/shell_dialogs/select_file_policy.h"
 
-namespace libgtkui {
+namespace gtk {
 
 // Shared implementation SelectFileDialog used by SelectFileDialogImplGTK
 class SelectFileDialogImpl : public ui::SelectFileDialog {
@@ -86,6 +86,6 @@ class SelectFileDialogImpl : public ui::SelectFileDialog {
   DISALLOW_COPY_AND_ASSIGN(SelectFileDialogImpl);
 };
 
-}  // namespace libgtkui
+}  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_SELECT_FILE_DIALOG_IMPL_H_
+#endif  // CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_H_
diff --git a/chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk.cc b/chrome/browser/ui/gtk/select_file_dialog_impl_gtk.cc
similarity index 98%
rename from chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk.cc
rename to chrome/browser/ui/gtk/select_file_dialog_impl_gtk.cc
index 6b41ae5ef1eda0..f9f407748852e3 100644
--- a/chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk.cc
+++ b/chrome/browser/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/libgtkui/select_file_dialog_impl_gtk.h"
+#include "chrome/browser/ui/gtk/select_file_dialog_impl_gtk.h"
 
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
@@ -23,8 +23,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/ui/libgtkui/gtk_util.h"
-#include "chrome/browser/ui/libgtkui/select_file_dialog_impl.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/shell_dialogs/select_file_dialog.h"
@@ -75,7 +75,7 @@ void OnFilePickerDestroy(base::OnceClosure* callback_raw) {
 
 }  // namespace
 
-namespace libgtkui {
+namespace gtk {
 
 // The size of the preview we display for selected image files. We set height
 // larger than width because generally there is more free space vertically
@@ -599,4 +599,4 @@ void SelectFileDialogImplGTK::OnUpdatePreview(GtkWidget* chooser) {
                                              pixbuf ? TRUE : FALSE);
 }
 
-}  // namespace libgtkui
+}  // namespace gtk
diff --git a/chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk.h b/chrome/browser/ui/gtk/select_file_dialog_impl_gtk.h
similarity index 93%
rename from chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk.h
rename to chrome/browser/ui/gtk/select_file_dialog_impl_gtk.h
index 1022a011bf3a02..e7a7577ff03385 100644
--- a/chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk.h
+++ b/chrome/browser/ui/gtk/select_file_dialog_impl_gtk.h
@@ -2,15 +2,15 @@
 // 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_SELECT_FILE_DIALOG_IMPL_GTK_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_SELECT_FILE_DIALOG_IMPL_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_GTK_H_
+#define CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_GTK_H_
 
 #include "base/macros.h"
-#include "chrome/browser/ui/libgtkui/gtk_util.h"
-#include "chrome/browser/ui/libgtkui/select_file_dialog_impl.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"
 
-namespace libgtkui {
+namespace gtk {
 
 // Implementation of SelectFileDialog that shows a Gtk common dialog for
 // choosing a file or folder. This acts as a modal dialog.
@@ -143,6 +143,6 @@ class SelectFileDialogImplGTK : public SelectFileDialogImpl,
   DISALLOW_COPY_AND_ASSIGN(SelectFileDialogImplGTK);
 };
 
-}  // namespace libgtkui
+}  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_SELECT_FILE_DIALOG_IMPL_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_SELECT_FILE_DIALOG_IMPL_GTK_H_
diff --git a/chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc b/chrome/browser/ui/gtk/select_file_dialog_impl_gtk_unittest.cc
similarity index 96%
rename from chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc
rename to chrome/browser/ui/gtk/select_file_dialog_impl_gtk_unittest.cc
index 503572d6376d8c..31fa47338e6435 100644
--- a/chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/select_file_dialog_impl_gtk_unittest.cc
@@ -2,12 +2,12 @@
 // 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/select_file_dialog_impl_gtk.h"
+#include "chrome/browser/ui/gtk/select_file_dialog_impl_gtk.h"
 
 #include "base/run_loop.h"
 #include "base/task/thread_pool/thread_pool_instance.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
-#include "chrome/browser/ui/libgtkui/gtk_ui.h"
+#include "chrome/browser/ui/gtk/gtk_ui.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "content/public/browser/browser_thread.h"
@@ -35,7 +35,7 @@ class SelectFileDialogImplGtkTest : public testing::Test {
   std::unique_ptr<views::LinuxUI> gtk_ui_;
 };
 
-namespace libgtkui {
+namespace gtk {
 
 class FilePicker : public ui::SelectFileDialog::Listener {
  public:
@@ -143,4 +143,4 @@ TEST_F(SelectFileDialogImplGtkTest, DISABLED_SelectFolder) {
   RunLoop().RunUntilIdle();
 }
 
-}  // namespace libgtkui
+}  // namespace gtk
diff --git a/chrome/browser/ui/libgtkui/select_file_dialog_impl_kde.cc b/chrome/browser/ui/gtk/select_file_dialog_impl_kde.cc
similarity index 92%
rename from chrome/browser/ui/libgtkui/select_file_dialog_impl_kde.cc
rename to chrome/browser/ui/gtk/select_file_dialog_impl_kde.cc
index a0a933591d4654..2f6e6f7cf804ff 100644
--- a/chrome/browser/ui/libgtkui/select_file_dialog_impl_kde.cc
+++ b/chrome/browser/ui/gtk/select_file_dialog_impl_kde.cc
@@ -24,7 +24,7 @@
 #include "base/task/post_task.h"
 #include "base/task/task_traits.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/ui/libgtkui/select_file_dialog_impl.h"
+#include "chrome/browser/ui/gtk/select_file_dialog_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -43,7 +43,7 @@ const char kKdialogBinary[] = "kdialog";
 
 }  // namespace
 
-namespace libgtkui {
+namespace gtk {
 
 // Implementation of SelectFileDialog that shows a KDE common dialog for
 // choosing a file or folder. This acts as a modal dialog.
@@ -127,24 +127,28 @@ class SelectFileDialogImplKDE : public SelectFileDialogImpl {
   // Notifies the listener that no file was chosen (the action was canceled).
   // Dialog is passed so we can find that |params| pointer that was passed to
   // us when we were told to show the dialog.
-  void FileNotSelected(void *params);
+  void FileNotSelected(void* params);
 
   void CreateSelectFolderDialog(Type type,
                                 const std::string& title,
                                 const base::FilePath& default_path,
-                                XID parent, void* params);
+                                XID parent,
+                                void* params);
 
   void CreateFileOpenDialog(const std::string& title,
-                                  const base::FilePath& default_path,
-                                  XID parent, void* params);
+                            const base::FilePath& default_path,
+                            XID parent,
+                            void* params);
 
   void CreateMultiFileOpenDialog(const std::string& title,
                                  const base::FilePath& default_path,
-                                 XID parent, void* params);
+                                 XID parent,
+                                 void* params);
 
   void CreateSaveAsDialog(const std::string& title,
                           const base::FilePath& default_path,
-                          XID parent, void* params);
+                          XID parent,
+                          void* params);
 
   // Common function for OnSelectSingleFileDialogResponse and
   // OnSelectSingleFolderDialogResponse.
@@ -215,8 +219,7 @@ SelectFileDialogImplKDE::SelectFileDialogImplKDE(
          desktop_ == base::nix::DESKTOP_ENVIRONMENT_KDE5);
 }
 
-SelectFileDialogImplKDE::~SelectFileDialogImplKDE() {
-}
+SelectFileDialogImplKDE::~SelectFileDialogImplKDE() {}
 
 bool SelectFileDialogImplKDE::IsRunning(gfx::NativeWindow parent_window) const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -262,8 +265,8 @@ void SelectFileDialogImplKDE::SelectFileImpl(
     case SELECT_FOLDER:
     case SELECT_UPLOAD_FOLDER:
     case SELECT_EXISTING_FOLDER:
-      CreateSelectFolderDialog(type, title_string, default_path,
-                               window_xid, params);
+      CreateSelectFolderDialog(type, title_string, default_path, window_xid,
+                               params);
       return;
     case SELECT_OPEN_FILE:
       CreateFileOpenDialog(title_string, default_path, window_xid, params);
@@ -291,8 +294,9 @@ std::string SelectFileDialogImplKDE::GetMimeTypeFilterString() {
   for (size_t i = 0; i < file_types_.extensions.size(); ++i) {
     for (size_t j = 0; j < file_types_.extensions[i].size(); ++j) {
       if (!file_types_.extensions[i][j].empty()) {
-        std::string mime_type = base::nix::GetFileMimeType(base::FilePath(
-            "name").ReplaceExtension(file_types_.extensions[i][j]));
+        std::string mime_type =
+            base::nix::GetFileMimeType(base::FilePath("name").ReplaceExtension(
+                file_types_.extensions[i][j]));
         filter_set.insert(mime_type);
       }
     }
@@ -385,7 +389,8 @@ void SelectFileDialogImplKDE::FileSelected(const base::FilePath& path,
 }
 
 void SelectFileDialogImplKDE::MultiFilesSelected(
-    const std::vector<base::FilePath>& files, void* params) {
+    const std::vector<base::FilePath>& files,
+    void* params) {
   *last_opened_path_ = files[0].DirName();
   if (listener_)
     listener_->MultiFilesSelected(files, params);
@@ -397,11 +402,14 @@ void SelectFileDialogImplKDE::FileNotSelected(void* params) {
 }
 
 void SelectFileDialogImplKDE::CreateSelectFolderDialog(
-    Type type, const std::string& title, const base::FilePath& default_path,
-    XID parent, void *params) {
+    Type type,
+    const std::string& title,
+    const base::FilePath& default_path,
+    XID parent,
+    void* params) {
   int title_message_id = (type == SELECT_UPLOAD_FOLDER)
-      ? IDS_SELECT_UPLOAD_FOLDER_DIALOG_TITLE
-      : IDS_SELECT_FOLDER_DIALOG_TITLE;
+                             ? IDS_SELECT_UPLOAD_FOLDER_DIALOG_TITLE
+                             : IDS_SELECT_FOLDER_DIALOG_TITLE;
   base::PostTaskAndReplyWithResult(
       pipe_task_runner_.get(), FROM_HERE,
       base::BindOnce(
@@ -416,8 +424,10 @@ void SelectFileDialogImplKDE::CreateSelectFolderDialog(
 }
 
 void SelectFileDialogImplKDE::CreateFileOpenDialog(
-    const std::string& title, const base::FilePath& default_path,
-    XID parent, void* params) {
+    const std::string& title,
+    const base::FilePath& default_path,
+    XID parent,
+    void* params) {
   base::PostTaskAndReplyWithResult(
       pipe_task_runner_.get(), FROM_HERE,
       base::BindOnce(
@@ -431,8 +441,10 @@ void SelectFileDialogImplKDE::CreateFileOpenDialog(
 }
 
 void SelectFileDialogImplKDE::CreateMultiFileOpenDialog(
-    const std::string& title, const base::FilePath& default_path,
-    XID parent, void* params) {
+    const std::string& title,
+    const base::FilePath& default_path,
+    XID parent,
+    void* params) {
   base::PostTaskAndReplyWithResult(
       pipe_task_runner_.get(), FROM_HERE,
       base::BindOnce(
@@ -446,8 +458,10 @@ void SelectFileDialogImplKDE::CreateMultiFileOpenDialog(
 }
 
 void SelectFileDialogImplKDE::CreateSaveAsDialog(
-    const std::string& title, const base::FilePath& default_path,
-    XID parent, void* params) {
+    const std::string& title,
+    const base::FilePath& default_path,
+    XID parent,
+    void* params) {
   base::PostTaskAndReplyWithResult(
       pipe_task_runner_.get(), FROM_HERE,
       base::BindOnce(
@@ -531,4 +545,4 @@ void SelectFileDialogImplKDE::OnSelectMultiFileDialogResponse(
   MultiFilesSelected(filenames_fp, params);
 }
 
-}  // namespace libgtkui
+}  // namespace gtk
diff --git a/chrome/browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc b/chrome/browser/ui/gtk/select_file_dialog_interactive_uitest.cc
similarity index 82%
rename from chrome/browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc
rename to chrome/browser/ui/gtk/select_file_dialog_interactive_uitest.cc
index 0bc450bbab4f04..5b4162521f78fb 100644
--- a/chrome/browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc
+++ b/chrome/browser/ui/gtk/select_file_dialog_interactive_uitest.cc
@@ -3,10 +3,11 @@
 // found in the LICENSE file.
 
 #include "base/macros.h"
+#include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
-#include "chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk.h"
+#include "chrome/browser/ui/gtk/select_file_dialog_impl_gtk.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
@@ -18,7 +19,7 @@
 
 using BrowserSelectFileDialogTest = InProcessBrowserTest;
 
-namespace libgtkui {
+namespace gtk {
 
 // FilePicker opens a GtkFileChooser.
 class FilePicker : public ui::SelectFileDialog::Listener {
@@ -31,25 +32,17 @@ class FilePicker : public ui::SelectFileDialog::Listener {
     ui::SelectFileDialog::FileTypeInfo file_types;
     file_types.allowed_paths = ui::SelectFileDialog::FileTypeInfo::ANY_PATH;
     const base::FilePath file_path;
-    select_file_dialog_->SelectFile(ui::SelectFileDialog::SELECT_OPEN_FILE,
-                                    base::string16(),
-                                    file_path,
-                                    &file_types,
-                                    0,
-                                    base::FilePath::StringType(),
-                                    parent_window,
-                                    nullptr);
+    select_file_dialog_->SelectFile(
+        ui::SelectFileDialog::SELECT_OPEN_FILE, base::string16(), file_path,
+        &file_types, 0, base::FilePath::StringType(), parent_window, nullptr);
   }
 
-  ~FilePicker() override {
-    select_file_dialog_->ListenerDestroyed();
-  }
+  ~FilePicker() override { select_file_dialog_->ListenerDestroyed(); }
 
   void Close() {
     SelectFileDialogImplGTK* file_dialog =
         static_cast<SelectFileDialogImplGTK*>(select_file_dialog_.get());
 
-
     while (!file_dialog->dialogs_.empty())
       gtk_widget_destroy(*(file_dialog->dialogs_.begin()));
   }
@@ -58,6 +51,7 @@ class FilePicker : public ui::SelectFileDialog::Listener {
   void FileSelected(const base::FilePath& path,
                     int index,
                     void* params) override {}
+
  private:
   // Dialog box used for opening and saving files.
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
@@ -65,7 +59,7 @@ class FilePicker : public ui::SelectFileDialog::Listener {
   DISALLOW_COPY_AND_ASSIGN(FilePicker);
 };
 
-}  // namespace libgtkui
+}  // namespace gtk
 
 // Leaks in GtkFileChooserDialog. http://crbug.com/537468
 // Flaky on Linux. http://crbug.com/700134
@@ -80,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(BrowserSelectFileDialogTest, MAYBE_ModalTest) {
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_TRUE(browser()->window()->IsActive());
 
-  libgtkui::FilePicker file_picker(browser()->window());
+  gtk::FilePicker file_picker(browser()->window());
 
   gfx::NativeWindow window = browser()->window()->GetNativeWindow();
   views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
@@ -102,8 +96,8 @@ IN_PROC_BROWSER_TEST_F(BrowserSelectFileDialogTest, MAYBE_ModalTest) {
   ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(window));
   EXPECT_FALSE(browser()->window()->IsActive());
 
-  ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      browser(), ui::VKEY_TAB, false, false, true, false));
+  ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_TAB, false,
+                                              false, true, false));
   EXPECT_FALSE(browser()->window()->IsActive());
 
   file_picker.Close();
diff --git a/chrome/browser/ui/libgtkui/settings_provider.h b/chrome/browser/ui/gtk/settings_provider.h
similarity index 76%
rename from chrome/browser/ui/libgtkui/settings_provider.h
rename to chrome/browser/ui/gtk/settings_provider.h
index ec06c6c3d631e7..c4c47183a026d0 100644
--- a/chrome/browser/ui/libgtkui/settings_provider.h
+++ b/chrome/browser/ui/gtk/settings_provider.h
@@ -2,10 +2,10 @@
 // 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_SETTINGS_PROVIDER_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_SETTINGS_PROVIDER_H_
+#ifndef CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_H_
+#define CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_H_
 
-namespace libgtkui {
+namespace gtk {
 
 // This class is just a switch between SettingsProviderGSettings and
 // SettingsProviderGtk.  Currently, it is empty and it's only purpose is so
@@ -21,6 +21,6 @@ class SettingsProvider {
   SettingsProvider() {}
 };
 
-}  // namespace libgtkui
+}  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_SETTINGS_PROVIDER_H_
+#endif  // CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_H_
diff --git a/chrome/browser/ui/libgtkui/settings_provider_gsettings.cc b/chrome/browser/ui/gtk/settings_provider_gsettings.cc
similarity index 96%
rename from chrome/browser/ui/libgtkui/settings_provider_gsettings.cc
rename to chrome/browser/ui/gtk/settings_provider_gsettings.cc
index 340c5c8aca3be6..4492467de3a2a9 100644
--- a/chrome/browser/ui/libgtkui/settings_provider_gsettings.cc
+++ b/chrome/browser/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/libgtkui/settings_provider_gsettings.h"
+#include "chrome/browser/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/libgtkui/gtk_ui.h"
-#include "chrome/browser/ui/libgtkui/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_ui.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 
 namespace {
 
@@ -29,7 +29,7 @@ const char kDefaultButtonString[] = ":minimize,maximize,close";
 
 }  // namespace
 
-namespace libgtkui {
+namespace gtk {
 
 // Public interface:
 
@@ -139,4 +139,4 @@ void SettingsProviderGSettings::ParseAndStoreMiddleClickValue(
       views::LinuxUI::WindowFrameActionSource::kMiddleClick, action);
 }
 
-}  // namespace libgtkui
+}  // namespace gtk
diff --git a/chrome/browser/ui/libgtkui/settings_provider_gsettings.h b/chrome/browser/ui/gtk/settings_provider_gsettings.h
similarity index 82%
rename from chrome/browser/ui/libgtkui/settings_provider_gsettings.h
rename to chrome/browser/ui/gtk/settings_provider_gsettings.h
index 52c4a9273a4d50..44fb6154fe8fe6 100644
--- a/chrome/browser/ui/libgtkui/settings_provider_gsettings.h
+++ b/chrome/browser/ui/gtk/settings_provider_gsettings.h
@@ -2,18 +2,18 @@
 // 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_SETTINGS_PROVIDER_GSETTINGS_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_SETTINGS_PROVIDER_GSETTINGS_H_
+#ifndef CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_GSETTINGS_H_
+#define CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_GSETTINGS_H_
 
 #include <gio/gio.h>
 
 #include <string>
 
 #include "base/macros.h"
-#include "chrome/browser/ui/libgtkui/settings_provider.h"
+#include "chrome/browser/ui/gtk/settings_provider.h"
 #include "ui/base/glib/glib_signal.h"
 
-namespace libgtkui {
+namespace gtk {
 class GtkUi;
 
 // On GNOME desktops, subscribes to the gsettings key which controlls button
@@ -52,6 +52,6 @@ class SettingsProviderGSettings : public SettingsProvider {
   DISALLOW_COPY_AND_ASSIGN(SettingsProviderGSettings);
 };
 
-}  // namespace libgtkui
+}  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_SETTINGS_PROVIDER_GSETTINGS_H_
+#endif  // CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_GSETTINGS_H_
diff --git a/chrome/browser/ui/libgtkui/settings_provider_gtk.cc b/chrome/browser/ui/gtk/settings_provider_gtk.cc
similarity index 96%
rename from chrome/browser/ui/libgtkui/settings_provider_gtk.cc
rename to chrome/browser/ui/gtk/settings_provider_gtk.cc
index 0a44cce8dfef0e..2ccd73f8bfd1a5 100644
--- a/chrome/browser/ui/libgtkui/settings_provider_gtk.cc
+++ b/chrome/browser/ui/gtk/settings_provider_gtk.cc
@@ -2,13 +2,13 @@
 // 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/settings_provider_gtk.h"
+#include "chrome/browser/ui/gtk/settings_provider_gtk.h"
 
 #include "base/strings/string_split.h"
-#include "chrome/browser/ui/libgtkui/gtk_ui.h"
-#include "chrome/browser/ui/libgtkui/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_ui.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 
-namespace libgtkui {
+namespace gtk {
 
 namespace {
 
@@ -144,4 +144,4 @@ void SettingsProviderGtk::OnThemeChanged(GtkSettings* settings,
   SetWindowButtonOrderingFromGtkLayout(layout);
 }
 
-}  // namespace libgtkui
+}  // namespace gtk
diff --git a/chrome/browser/ui/libgtkui/settings_provider_gtk.h b/chrome/browser/ui/gtk/settings_provider_gtk.h
similarity index 87%
rename from chrome/browser/ui/libgtkui/settings_provider_gtk.h
rename to chrome/browser/ui/gtk/settings_provider_gtk.h
index 8897261810d698..06cbd6fd066176 100644
--- a/chrome/browser/ui/libgtkui/settings_provider_gtk.h
+++ b/chrome/browser/ui/gtk/settings_provider_gtk.h
@@ -2,22 +2,22 @@
 // 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_SETTINGS_PROVIDER_GTK_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_SETTINGS_PROVIDER_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_GTK_H_
+#define CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_GTK_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
-#include "chrome/browser/ui/libgtkui/settings_provider.h"
+#include "chrome/browser/ui/gtk/settings_provider.h"
 #include "ui/base/glib/glib_signal.h"
 #include "ui/views/linux_ui/linux_ui.h"
 
 typedef struct _GParamSpec GParamSpec;
 typedef struct _GtkSettings GtkSettings;
 
-namespace libgtkui {
+namespace gtk {
 
 class GtkUi;
 
@@ -76,6 +76,6 @@ class SettingsProviderGtk : public SettingsProvider {
   DISALLOW_COPY_AND_ASSIGN(SettingsProviderGtk);
 };
 
-}  // namespace libgtkui
+}  // namespace gtk
 
-#endif  // CHROME_BROWSER_UI_LIBGTKUI_SETTINGS_PROVIDER_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_SETTINGS_PROVIDER_GTK_H_
diff --git a/chrome/browser/ui/views/linux_ui/linux_ui_factory_gtk.cc b/chrome/browser/ui/views/linux_ui/linux_ui_factory_gtk.cc
index 4889f4dc4a0d7c..578cde72f939b8 100644
--- a/chrome/browser/ui/views/linux_ui/linux_ui_factory_gtk.cc
+++ b/chrome/browser/ui/views/linux_ui/linux_ui_factory_gtk.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ui/views/linux_ui/linux_ui_factory.h"
 
-#include "chrome/browser/ui/libgtkui/gtk_ui.h"
+#include "chrome/browser/ui/gtk/gtk_ui.h"
 
 namespace views {
 
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 3450b9976f7fad..fd21ef99b6d843 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -4802,8 +4802,7 @@ test("unit_tests") {
     ]
   }
   if (use_gtk) {
-    sources +=
-        [ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ]
+    sources += [ "../browser/ui/gtk/select_file_dialog_impl_gtk_unittest.cc" ]
     deps += [ "//build/config/linux/gtk" ]
   }
 
@@ -4824,7 +4823,7 @@ test("unit_tests") {
     configs += [ "//build/linux:gio_config" ]
   }
   if (!is_chromeos && !use_ozone && is_linux) {
-    deps += [ "//chrome/browser/ui/libgtkui" ]
+    deps += [ "//chrome/browser/ui/gtk" ]
   }
 
   if (enable_service_discovery) {
@@ -5812,9 +5811,8 @@ if (!is_android) {
           "../browser/ui/views/keyboard_access_browsertest.cc",
         ]
         if (!use_ozone) {
-          sources += [
-            "../browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc",
-          ]
+          sources +=
+              [ "../browser/ui/gtk/select_file_dialog_interactive_uitest.cc" ]
           deps += [ "//build/config/linux/gtk" ]
         }
       }
diff --git a/docs/linux/gtk_theme_integration.md b/docs/linux/gtk_theme_integration.md
index 53e6b950836b2e..9e8c11722a62a1 100644
--- a/docs/linux/gtk_theme_integration.md
+++ b/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/libgtkui/native_theme_gtk.cc.
+//src/chrome/browser/ui/gtk/native_theme_gtk.cc.
diff --git a/tools/cfi/blacklist.txt b/tools/cfi/blacklist.txt
index 8ece972721811b..aa732c9e16e5df 100644
--- a/tools/cfi/blacklist.txt
+++ b/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/libgtkui/app_indicator_icon.cc
-src:*chrome/browser/ui/libgtkui/unity_service.cc
+src:*chrome/browser/ui/gtk/app_indicator_icon.cc
+src:*chrome/browser/ui/gtk/unity_service.cc
 src:*components/cronet/native/*
 src:*third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
 
diff --git a/ui/base/glib/scoped_gobject.h b/ui/base/glib/scoped_gobject.h
index 119fb1ba8e2d51..24ef91ec9be6a6 100644
--- a/ui/base/glib/scoped_gobject.h
+++ b/ui/base/glib/scoped_gobject.h
@@ -47,7 +47,7 @@ class ScopedGObject {
       g_object_ref_sink(obj_);
   }
 
-  // This function is necessary so that libgtkui can overload it in
+  // This function is necessary so that gtk can overload it in
   // the case of T = GtkStyleContext.
   void Unref() {
     if (obj_)