Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conflict-resolved patches from Chromium 147.0.7727.25 to Chromium 147.0.7727.49.

Browse Source
This commit is contained in:
Max Karolinskiy
2026-04-01 22:41:50 -04:00
parent c5f0048b3e
commit de54b54e69
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/chrome-browser-ui-actions-chrome_action_id.h.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/actions/chrome_action_id.h b/chrome/browser/ui/actions/chrome_action_id.h
index e7028788b77e6818ada071febd6fc3198b7b9721..133f224ec79e7c14336840c0595098281ae2cd9b 100644
index 3c03bd655e7e7e63f4e7ff7e85094d93b92b690c..13fa66e6b54e94125be69797a12d15bdb9db8273 100644
--- a/chrome/browser/ui/actions/chrome_action_id.h
+++ b/chrome/browser/ui/actions/chrome_action_id.h
@@ -556,6 +556,7 @@
@@ -16,5 +16,5 @@ index e7028788b77e6818ada071febd6fc3198b7b9721..133f224ec79e7c14336840c059509828
E(kActionTabSearch, IDC_TAB_SEARCH) \
+ E(kActionShowPartitionedStorage) \
E(kActionSplitTab, IDC_SPLIT_TAB) \
E(kActionGlicContextualCueing) \
#define CHROME_ACTION_IDS \
patches/components-browser_ui-widget-android-java-res-drawable-modern_toolbar_tablet_text_box_background.xml.patch
+5 -5
View File
@@ -1,13 +1,13 @@
diff --git a/components/browser_ui/widget/android/java/res/drawable/modern_toolbar_tablet_text_box_background.xml b/components/browser_ui/widget/android/java/res/drawable/modern_toolbar_tablet_text_box_background.xml
index 976e3ccd56399140d23ac1a16d6f5e20502959f8..4763efc65b0cea536a5fdb0960bd9128991222c8 100644
index d70be2f7794c298b99ee51d2ea3866b134850842..1b71327c10a8c3673974bf59ff360cd1a6c7ca52 100644
--- a/components/browser_ui/widget/android/java/res/drawable/modern_toolbar_tablet_text_box_background.xml
+++ b/components/browser_ui/widget/android/java/res/drawable/modern_toolbar_tablet_text_box_background.xml
@@ -5,7 +5,7 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
@@ -6,7 +6,7 @@ found in the LICENSE file.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/modern_toolbar_text_box_background"
+ <item android:drawable="@drawable/brave_modern_toolbar_text_box_background"
<item android:id="@+id/unfocused_bg"
- android:drawable="@drawable/modern_toolbar_text_box_background"
+ android:drawable="@drawable/brave_modern_toolbar_text_box_background"
android:top="@dimen/modern_toolbar_background_vertical_offset"
android:bottom="@dimen/modern_toolbar_background_vertical_offset" />
</layer-list>