From 22f863b37ae612feabccf23690f496161659d375 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Mon, 15 Nov 2021 01:18:33 -0600
Subject: [PATCH] fix: correct default text for button labels in gtk dialogs
 (#31798)

---
 shell/browser/ui/gtk_util.cc | 19 +++++--------------
 shell/browser/ui/gtk_util.h  |  3 ---
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/shell/browser/ui/gtk_util.cc b/shell/browser/ui/gtk_util.cc
index ba6d6472a37bf..3d279485cf505 100644
--- a/shell/browser/ui/gtk_util.cc
+++ b/shell/browser/ui/gtk_util.cc
@@ -17,10 +17,11 @@
 #include "third_party/skia/include/core/SkUnPreMultiply.h"
 #include "ui/gtk/gtk_compat.h"  // nogncheck
 
-namespace gtk_util {
-
 // The following utilities are pulled from
 // https://source.chromium.org/chromium/chromium/src/+/main:ui/gtk/select_file_dialog_impl_gtk.cc;l=43-74
+namespace gtk_util {
+
+namespace {
 
 const char* GettextPackage() {
   static base::NoDestructor<std::string> gettext_package(
@@ -32,44 +33,34 @@ const char* GtkGettext(const char* str) {
   return g_dgettext(GettextPackage(), str);
 }
 
+}  // namespace
+
 const char* GetCancelLabel() {
-  if (!gtk::GtkCheckVersion(4))
-    return "gtk-cancel";  // In GTK3, this is GTK_STOCK_CANCEL.
   static const char* cancel = GtkGettext("_Cancel");
   return cancel;
 }
 
 const char* GetOpenLabel() {
-  if (!gtk::GtkCheckVersion(4))
-    return "gtk-open";  // In GTK3, this is GTK_STOCK_OPEN.
   static const char* open = GtkGettext("_Open");
   return open;
 }
 
 const char* GetSaveLabel() {
-  if (!gtk::GtkCheckVersion(4))
-    return "gtk-save";  // In GTK3, this is GTK_STOCK_SAVE.
   static const char* save = GtkGettext("_Save");
   return save;
 }
 
 const char* GetOkLabel() {
-  if (!gtk::GtkCheckVersion(4))
-    return "gtk-ok";  // In GTK3, this is GTK_STOCK_OK.
   static const char* ok = GtkGettext("_Ok");
   return ok;
 }
 
 const char* GetNoLabel() {
-  if (!gtk::GtkCheckVersion(4))
-    return "gtk-no";  // In GTK3, this is GTK_STOCK_NO.
   static const char* no = GtkGettext("_No");
   return no;
 }
 
 const char* GetYesLabel() {
-  if (!gtk::GtkCheckVersion(4))
-    return "gtk-yes";  // In GTK3, this is GTK_STOCK_YES.
   static const char* yes = GtkGettext("_Yes");
   return yes;
 }
diff --git a/shell/browser/ui/gtk_util.h b/shell/browser/ui/gtk_util.h
index 5d77ec668aab8..31bfa049e98cd 100644
--- a/shell/browser/ui/gtk_util.h
+++ b/shell/browser/ui/gtk_util.h
@@ -11,9 +11,6 @@ class SkBitmap;
 
 namespace gtk_util {
 
-const char* GettextPackage();
-const char* GtkGettext(const char* str);
-
 const char* GetCancelLabel();
 const char* GetOpenLabel();
 const char* GetSaveLabel();