Remove patch

brave · Nov 29, 2022 · f820f7f · f820f7f
1 parent a9d1024
commit f820f7f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git 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
@@ -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