From ce3074d140aecadef5af4bbbc28fc882733516ec Mon Sep 17 00:00:00 2001
From: Jay Harris <jay.harris@outlook.co.nz>
Date: Tue, 29 Nov 2022 14:57:05 +1300
Subject: [PATCH] Remove patch

---
 .../ui/views/controls/button/md_text_button.cc     |  8 ++++----
 .../ui/views/controls/button/md_text_button.h      | 14 ++++++++------
 ...i-views-controls-button-md_text_button.cc.patch | 12 ------------
 3 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 patches/ui-views-controls-button-md_text_button.cc.patch

diff --git a/chromium_src/ui/views/controls/button/md_text_button.cc b/chromium_src/ui/views/controls/button/md_text_button.cc
index 01e3cd0f7beb..ef3afc74dc09 100644
--- a/chromium_src/ui/views/controls/button/md_text_button.cc
+++ b/chromium_src/ui/views/controls/button/md_text_button.cc
@@ -24,9 +24,6 @@
 #include "ui/views/controls/highlight_path_generator.h"
 #include "ui/views/view_class_properties.h"
 
-// To be called from MdTextButtonBase::UpdateColors().
-#define BRAVE_MD_TEXT_BUTTON_UPDATE_COLORS UpdateIconForBrave();
-
 #define MdTextButton MdTextButtonBase
 #include "src/ui/views/controls/button/md_text_button.cc"
 #undef MdTextButton
@@ -271,7 +268,10 @@ void MdTextButton::UpdateBackgroundColor() {
           colors.background_color, colors.stroke_color, GetCornerRadius())));
 }
 
-void MdTextButton::UpdateIconForBrave() {
+void MdTextButton::UpdateColors() {
+  MdTextButtonBase::UpdateColors();
+
+  // Update the icon color.
   if (icon_) {
     SetImageModel(
         ButtonState::STATE_NORMAL,
diff --git a/chromium_src/ui/views/controls/button/md_text_button.h b/chromium_src/ui/views/controls/button/md_text_button.h
index 5560ecb5de57..6c8699a1f050 100644
--- a/chromium_src/ui/views/controls/button/md_text_button.h
+++ b/chromium_src/ui/views/controls/button/md_text_button.h
@@ -15,15 +15,17 @@
 #define MdTextButton MdTextButtonBase
 
 // Redefine UpdateTextColor as protected virtual so we can override it.
-#define UpdateTextColor                  \
-  UpdateTextColor_Unused();              \
-                                         \
- protected:                              \
-  virtual void UpdateIconForBrave() = 0; \
+#define UpdateTextColor     \
+  UpdateTextColor_Unused(); \
+                            \
+ protected:                 \
   virtual void UpdateTextColor
 
+#define UpdateColors virtual UpdateColors
+
 #include "src/ui/views/controls/button/md_text_button.h"
 
+#undef UpdateColors
 #undef UpdateTextColor
 #undef MdTextButton
 
@@ -63,7 +65,7 @@ class VIEWS_EXPORT MdTextButton : public MdTextButtonBase {
   // MdTextButtonBase:
   void UpdateTextColor() override;
   void UpdateBackgroundColor() override;
-  void UpdateIconForBrave() override;
+  void UpdateColors() override;
 
  protected:
   // views::Views
diff --git a/patches/ui-views-controls-button-md_text_button.cc.patch b/patches/ui-views-controls-button-md_text_button.cc.patch
deleted file mode 100644
index 0f0c33d66b11..000000000000
--- a/patches/ui-views-controls-button-md_text_button.cc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/ui/views/controls/button/md_text_button.cc b/ui/views/controls/button/md_text_button.cc
-index 2110ef33b92bd6535bf243c03ae0fe2ee7cea5d4..8214c1cb8db1ccd3d9a6a5c347b91af13b5892b0 100644
---- a/ui/views/controls/button/md_text_button.cc
-+++ b/ui/views/controls/button/md_text_button.cc
-@@ -250,6 +250,7 @@ void MdTextButton::UpdateColors() {
-     UpdateTextColor();
-     UpdateBackgroundColor();
-     SchedulePaint();
-+    BRAVE_MD_TEXT_BUTTON_UPDATE_COLORS
-   }
- }
-