Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade from Chromium 126 to Chromium 127 #23829

Merged
merged 131 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
2e9df9a
Update from Chromium 126.0.6478.114 to Chromium 127.0.6533.17.
cdesouza-chromium May 30, 2024
c6e088a
Conflict-resolved patches from Chromium 126.0.6478.114 to Chromium 12…
cdesouza-chromium May 30, 2024
69660a7
Update patches from Chromium 126.0.6478.114 to Chromium 127.0.6533.17.
cdesouza-chromium Jun 14, 2024
05e6d37
Updated strings for Chromium 127.0.6533.17.
cdesouza-chromium Jun 10, 2024
dd2c780
`gnrt` run for Chromium 127.0.6533.17
cdesouza-chromium May 21, 2024
aabfd31
Fix `LoginDatabase::StatementToForms` overrides
cdesouza-chromium May 21, 2024
4ea2e9d
`features::kDnsOverHttps` deleted upstream
cdesouza-chromium May 21, 2024
24a0d5c
NAK related flags consolidated into one
cdesouza-chromium May 21, 2024
5eacc13
Fixing re-exporting of tests funcs for page_visibility.ts
cdesouza-chromium May 21, 2024
3336f37
YWYU inclusion fixes
cdesouza-chromium May 21, 2024
815c1fa
Tab search caption button removed from pre-refresh location
cdesouza-chromium May 21, 2024
a9560ad
`kPrivacySandboxAggregationServiceReportPadding` deleted
cdesouza-chromium May 21, 2024
aa79485
`kPrivateAggregationApiContextIdEnhancements` deleted
cdesouza-chromium May 21, 2024
1b7accf
[Android] Stop accepting fragment as raw string in SettingsLauncher API
samartnik May 21, 2024
f8a902e
[Android] Split SearchActivityUtils part 2: isolate Client logic
samartnik May 21, 2024
e5d3407
[Android] Remove remnants of ProfileAndroid
samartnik May 21, 2024
15d8a7f
[Android] Fix for missing override lint warning
samartnik May 22, 2024
aa84e5e
[Android] Changed base class for unit tests to BaseJUnit4ClassRunner
samartnik May 23, 2024
ba0e14a
kWinrtGeolocationImplementation feature flag removed
emerick May 23, 2024
5f4d29d
Make adjustments for upstream tests
emerick May 24, 2024
6dcb072
Disable CHECK(!is_explicit_setting) for AllowPartitionedCookies
emerick May 26, 2024
d6c9018
Explicitly add kSharingHub icon now that IsChromeRefresh2023() is ena…
emerick May 26, 2024
c7d2d3c
The kSidePanelPinning feature is no longer tied to IsChromeRefresh202…
emerick May 26, 2024
7d7713f
`kAttributionReportingTriggerContextId` deleted upstream
cdesouza-chromium May 23, 2024
b2de86c
`net::ParsedCookie`ctor removed block truncation arg
cdesouza-chromium May 23, 2024
61388ee
Reanchor overrides for `PrintRenderFrameHelper`
cdesouza-chromium May 23, 2024
afc190d
[Android] Delete tab suggestions
samartnik May 27, 2024
97b292a
Fix override for GetNullAggregatableReports due to upstream refactoring
emerick May 28, 2024
1a1cce1
Avoid static assertion with our negative PageActionIconType values
emerick May 28, 2024
534f0d9
Only call base class GetAnchorView if side panel pinning is enabled
emerick May 29, 2024
a19c44f
Use `NOTREACHED_IN_MIGRATION()`
cdesouza-chromium May 27, 2024
487566a
`kPrivateAggregationApiMultipleCloudProviders` deleted
cdesouza-chromium May 28, 2024
6e21025
`SearchEngineChoiceService` ctor taking local state
cdesouza-chromium May 28, 2024
7cf53f0
[Android] Fix for base java patch
samartnik May 30, 2024
f3c1434
[Android] Remove getLastUsedRegularProfile from TabSwitcherActionMenu…
samartnik May 27, 2024
4299dd3
Disable IsolateSandboxedIframes feature flag
emerick May 30, 2024
66dbafb
Add IDC_SHOW_AVATAR_MENU to browser commands exceptions list
emerick May 30, 2024
aa254b8
The main toolbar is no longer tied to IsChromeRefresh2023Enabled()
emerick May 30, 2024
df4595a
Reinstate `SidePanelToolbarButton` as it was deleted upstream
cdesouza-chromium May 29, 2024
017c740
Prempting inclusions to avoid unwanted token replacements
cdesouza-chromium May 29, 2024
ba835dc
`RenderFrame::ElementBoundsInWindow` removed
cdesouza-chromium May 29, 2024
2ee96ee
`kTrackingProtectionContentSetting` renamed
cdesouza-chromium May 29, 2024
adc0a01
`//chrome/browser:browser_themes` -> `//chrome/browser/themes`
cdesouza-chromium May 29, 2024
ba557d3
`content` input code moved under `components/`
cdesouza-chromium May 29, 2024
6fed823
Reanchor `StartWhatsNewFetch` overrides
cdesouza-chromium May 29, 2024
38b0639
Add missing DEPS to //brave/browser/ui
emerick Jun 1, 2024
ed0ec4d
Bump ModelTypeForHistograms::kMaxValue to account for kPlusAddressSet…
emerick Jun 1, 2024
e69775f
clearBrowsingDataConfirm button was renamed to clearButton
emerick Jun 1, 2024
8d9d523
[Android] Remove default implementations of SafetyNetApiHandler app v…
samartnik Jun 3, 2024
882a482
[Android] Minor code adjustments to the C127 upstream changes
samartnik Jun 3, 2024
092620f
[Android] Require @JniType conversions functions to appear in .h files
samartnik Jun 3, 2024
855f3a0
Avoid DCHECK when laying out PageInfo cookie controls
emerick Jun 4, 2024
6a393ed
rbe_bin_dir -> reclient_bin_dir
emerick Jun 4, 2024
4c364d2
Fix tabstrip styles for Chromium 127
zenparsing Jun 3, 2024
fbf8f68
`views::Widget::InitParams` zero arg ctor deleted
cdesouza-chromium May 31, 2024
e7b8b73
`kChromeRefresh2023` deleted from upstream
cdesouza-chromium Jun 3, 2024
2de302b
`ChromeRefresh2023TabGroupStyle` merged into `TabGroupStyle`
cdesouza-chromium Jun 3, 2024
84dcd38
`GetPrepopulatedEngines` dropped default args
cdesouza-chromium Jun 3, 2024
b773209
Remove `TabLayout` alignment overrides
cdesouza-chromium Jun 5, 2024
afe031c
Accomodate changes to CalculatePreferredSize and GetHeightForWidth
emerick Jun 6, 2024
505868a
Add ECDSA_SHA384 for SignatureAlgorithmToString
emerick Jun 6, 2024
70810ec
Output of MD5 operations is now a std::array
emerick Jun 6, 2024
68c80fc
`GM2TabStyle` deleted
cdesouza-chromium May 31, 2024
8262dc9
`TabGroupHeader` deleted non-cr2023 code paths
cdesouza-chromium Jun 5, 2024
ce25f07
Fix tab layout issues after removal of refresh flag
zenparsing Jun 6, 2024
761bc7a
Fixed omnibox popup radius regression
simonhong Jun 7, 2024
57b1196
Force GetCookieSetting to use a first-party context when calling into…
emerick Jun 7, 2024
237ece6
[Android] V8 enable shipping both snapshots
samartnik Jun 7, 2024
5e26b1e
[Android] ShowScrollableMVTOnNTP feature was removed
samartnik Jun 7, 2024
04cfbc3
[Android] Fixes for bytecode unit tests
samartnik Jun 7, 2024
7458219
Continue to use profile_background_container_ to set profile menu bac…
emerick Jun 8, 2024
a4df02f
Tab should have extra left-side padding always
simonhong Jun 10, 2024
10ea8a9
Fixed bookmark/readinglist page is not shown in side panel
simonhong Jun 10, 2024
61c78c3
`kFedCmWithoutThirdPartyCookies` deleted upstream
cdesouza-chromium Jun 10, 2024
e620d09
`SiteForCookies` to be provided with `GetCookieSetting`
cdesouza-chromium Jun 10, 2024
f79a577
Remove PDF OCR mock function
cdesouza-chromium Jun 10, 2024
afa59dc
`kAppBoundEncryptionMetrics` deleted
emerick Jun 10, 2024
6efccee
Use Leo hamburger menu icon
emerick Jun 10, 2024
23f55ef
Add needed //chrome/browser/search_engines dep
emerick Jun 10, 2024
f87a408
[Android] Disable Android Tab Group Stable IDs
samartnik Jun 10, 2024
480657b
[Android] ShowScrollableMVTOnNTP feature was removed
samartnik Jun 10, 2024
1faba00
Don't use upstream's material Omnibox colors
emerick Jun 11, 2024
0a702ee
[Android] Disable Enable Magic feature
samartnik Jun 11, 2024
d810f61
Fixed crash when opening playlist/chat side panel
simonhong Jun 12, 2024
dddce40
fixup! Updated upgrade menu item's bg radius, border padding
cdesouza-chromium Jun 12, 2024
f0b2725
`sidepanel` moved under browser `ui/views/` subpath
cdesouza-chromium Jun 10, 2024
492ef93
`kSidePanelPinning` deleted and made official
cdesouza-chromium Jun 11, 2024
0e504a0
`TabStripModel` added data interface for content
cdesouza-chromium Jun 11, 2024
562506b
`SidePanelEntry` removed `icon`/`name` fields
cdesouza-chromium Jun 11, 2024
5dd06ba
`//sql` transactions taking `cstring_view`
cdesouza-chromium Jun 11, 2024
6dfbdc0
`TabDragController` refactored to drag grouped tabs
cdesouza-chromium Jun 11, 2024
dc21750
`chrome-refresh-2023` clean up for `ui/view/frame/`
cdesouza-chromium Jun 11, 2024
f1875c8
Fixing override access to `PermissionPromptBubbleBaseView`
cdesouza-chromium Jun 11, 2024
716cb25
Removing broken `TabSearchBubbleHost` override
cdesouza-chromium Jun 11, 2024
404e740
`kTabGroupsLearnMoreURL` implementation
cdesouza-chromium Jun 11, 2024
302dc79
Fix `PermissionContextBase::CleanUpRequest` override
cdesouza-chromium Jun 11, 2024
c5942c3
[Android] Use BottomControlsStacker to resize bottom browser controls
samartnik Jun 11, 2024
5f3fa54
Removes unused TemplateURLPrepopulateData::IsQwant function.
mkarolin Jun 11, 2024
2e1f964
Updates TemplateURLPrepopulateData overrides.
mkarolin Jun 11, 2024
c9ca247
`kReadAnything` deleted upstream
cdesouza-chromium Jun 12, 2024
3bd9a60
`browser/companion` not to be included on android
cdesouza-chromium Jun 12, 2024
afeb465
Adjust resource_ids.spec to avoid duplicate resources with upstream
emerick Jun 13, 2024
678f140
[Android] Fixes for unit tests
samartnik Jun 12, 2024
7ebfeeb
Remove unused include for sync_service_factory.h
emerick Jun 13, 2024
87ea94a
Add //chrome/browser/sync where necessary
emerick Jun 13, 2024
78a2c18
Remove obsolete src override for tab strip positioning
emerick Jun 13, 2024
2765070
Remove DEPS include_rule forbidding "chrome/browser/ui/views"
emerick Jun 13, 2024
e58123a
Remove obsolete parameter from TemplateURLPrepopulateData::GetPrepopu…
emerick Jun 13, 2024
dd1d0cd
Adjust src override for chrome_test_launcher.cc
emerick Jun 13, 2024
232a309
Disable kUseMoveNotCopyInMergeTreeUpdate
darkdh Jun 14, 2024
77e824a
Update HSTS overrides to also include TransportSecurityState::GetSSLU…
emerick Jun 14, 2024
6839133
[ios] Don't enforce early registration of KeyedServiceFactories on ios
emerick Jun 17, 2024
7049b8f
[iOS] Disable GoogleGroupsUpdaterService via factory
emerick Jun 17, 2024
4dd1636
[ios] Use correct bookmarks factory based on unified feature flag
kylehickinson Jun 17, 2024
62ae3ad
[Android] Fix for fixed MVT view
samartnik Jun 17, 2024
4a3c4b0
Don't show pin buttons for side panel in toolbar
simonhong Jun 18, 2024
97e2341
[ads] Fix custom notification ad popup layout
aseren Jun 17, 2024
471bb44
Add missing //components/manta dep
emerick Jun 19, 2024
4fb93a3
Disable GoogleGroupsUpdaterService via factory on desktop
emerick Jun 21, 2024
04dc216
Updated vector_icons/leo_overrides.json
simonhong Jun 21, 2024
4877e2f
Revert tri-color theme picker to bi-color picker and fix theme colors…
emerick Jun 21, 2024
9dd0cfc
Revert "Disable IsolateSandboxedIframes feature flag"
emerick Jun 21, 2024
15315fd
Add allow-same-origin attribute to sandbox attribute for portfolio chart
emerick Jun 21, 2024
ed45376
Add RenderViewHostTestEnabler for SplitViewBrowserData unit tests
emerick Jun 21, 2024
8645878
Disable syncer::kEnableBookmarkFoldersForAccountStorage
emerick Jun 21, 2024
fa7c3e4
Disabled some upstream color mixers that overwrite our colors
simonhong Jun 24, 2024
245342e
Updated layout constants for toolbar
simonhong Jun 24, 2024
93dd1da
Fixed dialog button has long height
simonhong Jun 24, 2024
ddb4cb9
Added missing views combobox control colors
simonhong Jun 24, 2024
1a86bea
[rust] `winapi` crate dropped by upstream
cdesouza-chromium Jun 24, 2024
9a0080a
[rust] Ignore format for `chromium_crates_io/vendor`
cdesouza-chromium Jun 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions android/brave_java_sources.gni
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ brave_java_sources = [
"../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveWalletSolanaConnectedSitesPreference.java",
"../../brave/android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderManager.java",
"../../brave/android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderUtils.java",
"../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesLayoutBase.java",
"../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesMediator.java",
"../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java",
"../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncDevices.java",
Expand Down
1 change: 0 additions & 1 deletion android/features/tab_ui/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ android_library("java") {
deps = [
"//base:base_java",
"//chrome/android:chrome_java",
"//chrome/android/features/tab_ui:tab_suggestions_java",
"//chrome/browser/android/lifecycle:java",
"//chrome/browser/browser_controls/android:java",
"//chrome/browser/commerce/merchant_viewer/android:java",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,6 @@
To group tabs, touch & hold a tab. Then, drag it onto another tab.
</message>

<!-- Tab Carousel strings -->
<message name="IDS_TAB_SWITCHER_CAROUSEL_TITLE" desc="Title of the Tabs carousel section on the single pane start surface.">
Continue browsing
</message>

<!-- Single Tab module strings -->
<message name="IDS_SINGLE_TAB_MODULE_TITLE" desc="Title of the single Tab module on the magic space of the start surface or NTP home surface.">
Your last tab
Expand All @@ -406,37 +401,6 @@
<ph name="NUMBER_OF_TABS">%1$s<ex>2</ex></ph> tabs seem related. Group them?
</message>

<!-- Tab Cleanup strings -->
<message name="IDS_TAB_CLEANUP_MESSAGE_CARD_TITLE" desc="Header for the Tab Cleanup message card where a user can review suggested tabs to close before closing or just close them outright.">
Want to close old tabs?
</message>
<message name="IDS_TAB_CLEANUP_MESSAGE_CARD_SUBTITLE" desc="Subtitle for the Tab Cleanup message card that indicates the number of suggested tabs a user can review to close before closing or just close them outright.">
{TABS_COUNT, plural,
=1 {You have <ph name="TABS_COUNT_ONE">%1$s<ex>1</ex></ph> tab you haven't used recently}
other {You have <ph name="TABS_COUNT_MANY">%1$s<ex>8</ex></ph> tabs you haven't used recently}
}
</message>
<message name="IDS_TAB_CLEANUP_MESSAGE_CARD_REVIEW_TABS_BUTTON" desc="Button text where a user can review suggested tabs to close before closing.">
Review tabs
</message>
<message name="IDS_TAB_CLEANUP_MESSAGE_CARD_CLOSE_TABS_BUTTON" desc="Button text where a user can close suggested tabs without reviewing them.">
Close without reviewing
</message>

<!-- Tab Declutter strings -->
<message name="IDS_TAB_DECLUTTER_MESSAGE_CARD_TEXT_INFO" desc="Text info for the Tab Declutter message card that indicates the number of archived tabs a user can review to close.">
{TABS_COUNT, plural,
=1 {You have <ph name="TABS_COUNT_ONE">%1$s<ex>1</ex></ph> archived tab}
other {You have <ph name="TABS_COUNT_MANY">%1$s<ex>8</ex></ph> archived tabs}
}
</message>
<message name="IDS_TAB_DECLUTTER_MESSAGE_CARD_REVIEW_SETTINGS_DESCRIPTION" desc="Acessibility string describing the settings icon on the tab declutter message card interface.">
Review the current declutter settings.
</message>
<message name="IDS_TAB_DECLUTTER_MESSAGE_CARD_REVIEW_ARCHIVED_TABS_DESCRIPTION" desc="Acessibility string describing the expand icon for reviewing archived tabs on the tab declutter message card interface.">
Review all archived tabs for declutter by entering this editor.
</message>

<!-- Accessibility strings for Tab Suggestion -->
<message name="IDS_ACCESSIBILITY_TAB_SUGGESTION_REVIEW_BUTTON" desc="The accessibility text to read when the text button 'Review' is focused. The 'Review' button is shown next to the message 'X of your tabs haven't been used lately. Close them?', or 'X tabs seem related. Group them?'. User uses that text button to enter a selection mode where they can see the suggested tabs to close or to group, see the rest of their open tabs, and choose what tabs to close or to group.">
Review the suggestions.
Expand Down Expand Up @@ -587,14 +551,6 @@
<message name="IDS_CLOSE_ALL_TABS_DIALOG_TITLE" desc="When users click the menu item 'Close all tabs' in tab switcher, a dialog will pop up and this text is the title of the dialog.">
Close all tabs?
</message>
<message name="IDS_CLOSE_ALL_TABS_DIALOG_MESSAGE" desc="When users click the menu item 'Close all tabs' in tab switcher, a dialog will pop up and this text is the message of the dialog.">
You can find your closed tabs in Recent tabs under the Brave main menu.
</message>
<message name="IDS_CLOSE_ALL_TABS_DIALOG_MESSAGE_WITH_INCOGNITO_TABS" desc="When users click the menu item 'Close all tabs' in tab switcher, a dialog will pop up and this text is the message of the dialog. If there are any Private tabs opened this message would warn users that those Private tabs would be lost.">
{INCOGNITO_TABS_COUNT, plural,
=1 {You can find your closed tabs in Recent tabs under the Brave main menu. Your Private tab won't be available.}
other {You can find your closed tabs in Recent tabs under the Brave main menu. Your # Private tabs won't be available.}}
</message>
<message name="IDS_CLOSE_ALL_TABS_DIALOG_TITLE_INCOGNITO" desc="When users click the menu item 'Close all tabs' in Private tab switcher, a dialog will pop up and this text is the title of the dialog.">
Close all Private tabs?
</message>
Expand Down Expand Up @@ -766,6 +722,11 @@
<message name="IDS_CLOSE_ALL_TABS_AND_GROUPS_DIALOG_MESSAGE" desc="Description of the action of closing all tabs and groups, shown in a confirmation dialog.">
Your closed tabs and groups can be reopened from the Recent tabs section and the Tab groups section.
</message>
<message name="IDS_CLOSE_ALL_TABS_AND_GROUPS_DIALOG_MESSAGE_WITH_INCOGNITO_TABS" desc="Description of the action of closing all tabs and group, shown in a confirmation dialog. If there are any Private tabs opened this message would warn users that those Private tabs would be lost.">
{INCOGNITO_TABS_COUNT, plural,
=1 {Your closed tabs and groups can be reopened from the Recent tabs section and the Tab groups section. Your Private tab won't be available.}
other {Your closed tabs and groups can be reopened from the Recent tabs section and the Tab groups section. Your # Private tabs won't be available.}}
</message>
<message name="IDS_CLOSE_ALL_TABS_AND_GROUPS_ACTION" desc="Button text in a confirmation dialog which will close all tabs and groups.">
Close all tabs and groups
</message>
Expand All @@ -775,9 +736,6 @@
<message name="IDS_REMOVE_FROM_GROUP_DESCRIPTION" desc="Descirotion of the action of removing all tabs in a group, shown in a confirmation dialog.">
This will delete the group from all devices signed into <ph name="USER_EMAIL">%1$s<ex>test@gmail.com</ex></ph>
</message>
<message name="IDS_CLOSE_FROM_GROUP_DIALOG_TITLE" desc="Title of a dialog asking if the user really wants to close a tab and group.">
Close tab and delete group?
</message>
<message name="IDS_CLOSE_TAB_GROUP_MENU_ITEM" desc="Menu item text which will prompt a confirmation dialog to close a tab group.">
Close
</message>
Expand All @@ -787,9 +745,6 @@
<message name="IDS_ACCESSIBILITY_OPEN_TAB_GROUP_OVERFLOW_MENU_WITH_GROUP_NAME" desc="Accessibility string for opening the overflow menu on a tab group, which will allow the user to perform several actions on the tab group. TITLE_OF_GROUP is the title of the group.">
Open the tab group action menu for tab group <ph name="TITLE_OF_GROUP">%1$s<ex>Shopping cart</ex></ph>
</message>
<message name="IDS_CLOSE_FROM_GROUP_DESCRIPTION" desc="Description of the ation of deleting a tab and a group, shown in a confirmation dialog.">
This will delete the group from all devices signed into <ph name="USER_EMAIL">%1$s<ex>test@gmail.com</ex></ph>
</message>
<message name="IDS_REMOVE_LAST_TAB_ACTION" desc="The text shown on the bottom bar when the user is dragging the last tab of a group around. Indicates removing this tab will also delete the group.">
Remove tab and delete group
</message>
Expand All @@ -808,6 +763,9 @@
<message name="IDS_TAB_GROUPS_EMPTY_STATE_DESCRIPTION" desc="The detailed description of the purpose of the tab groups surface. Shown when the user does not currently have any tab groups.">
Tab groups automatically save and update across all your devices
</message>
<message name="IDS_TAB_GROUPS_EMPTY_STATE_DESCRIPTION_NO_SYNC" desc="The detailed description of the purpose of the tab groups surface. Shown when the user does not currently have any tab groups and is not syncing.">
Create groups to organize your tabs.
</message>
<message name="IDS_TAB_GROUP_SURFACE_IPH_WITH_SYNC" desc="IPH text to hint the user to opening the dedicated tab groups UI surface when syncing tab groups is enabled.">
Your tab groups are saved here and get updated across all your signed-in devices
</message>
Expand All @@ -817,9 +775,18 @@
<message name="IDS_NEWLY_SYNCED_TAB_GROUP_IPH" desc="IPH text highlighting a tab group that was synced from another device">
New group from your other device
</message>
<message name="IDS_FIND_HIDDEN_TAB_GROUP_IPH" desc="IPH text to hint the user to opening the dedicated tab groups UI surface after hiding a tab group.">
You can find all your tab groups here
</message>
<message name="IDS_OPEN_TAB_GROUP_MENU_ITEM" desc="Menu item to open a more detailed view of a tab group.">
Open
</message>
<message name="IDS_TAB_GROUP_ROW_ACCESSIBILITY_TEXT" desc="Content description for accessibility to describe action of tapping on a tab group row.">
Open <ph name="TITLE_OF_GROUP">%s<ex>shopping</ex></ph>
</message>
<message name="IDS_TAB_GROUP_MENU_ACCESSIBILITY_TEXT" desc="Content description for accessibility to describe the action of tapping on the more menu button.">
<ph name="TITLE_OF_GROUP">%s<ex>shopping</ex></ph> tab group options
</message>

<!-- Tabs Settings Strings -->
<message name="IDS_TABS_SETTINGS_TITLE" desc="A title to show in the top toolbar when the Tabs settings page is open.">
Expand All @@ -828,6 +795,17 @@
<message name="IDS_AUTO_OPEN_SYNCED_TAB_GROUPS_SUMMARY" desc="A title to show in the top toolbar when the Tabs settings page is open.">
Automatically open tab groups from other devices
</message>

<!-- Archived tabs strings -->
<message name="IDS_ARCHIVED_TABS_DIALOG_TITLE" desc="The toolbar title for the archived tabs dialog.">
{TABS_COUNT, plural,
=1 {<ph name="TABS_COUNT_ONE">%1$d<ex>1</ex></ph> inactive tab}
other {<ph name="TABS_COUNT_MANY">%1$d<ex>8</ex></ph> inactive tabs}
}
</message>
<message name="IDS_ARCHIVED_TABS_DIALOG_CLOSE_ALL_BUTTON" desc="The button title for the archived tabs dialog. Closes all inactive tabs.">
Close all inactive tabs
</message>
</messages>
</release>
</grit>
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,18 @@
</translations>
<release seq="1">
<messages fallback_to_english="true">
<message name="IDS_CLOSE_ALL_TABS_DIALOG_MESSAGE_WITH_INCOGNITO_TABS" desc="When users click the menu item 'Close all tabs' in tab switcher, a dialog will pop up and this text is the message of the dialog. If there are any Private tabs opened this message would warn users that those Private tabs would be lost.">
{INCOGNITO_TABS_COUNT, plural,
=1 {You can find your closed tabs in Recent tabs under the Brave main menu. Your Private tab won't be available.}
other {You can find your closed tabs in Recent tabs under the Brave main menu. Your # Private tabs won't be available.}}
</message>
<message name="IDS_CLOSE_ALL_TABS_DIALOG_TITLE_INCOGNITO" desc="When users click the menu item 'Close all tabs' in Private tab switcher, a dialog will pop up and this text is the title of the dialog.">
Close all Private tabs?
</message>
<message name="IDS_CLOSE_ALL_TABS_DIALOG_MESSAGE_INCOGNITO" desc="When users click the menu item 'Close all tabs' in Private tab switcher, a dialog will pop up and this text is the message of the dialog.">
Your activity in these Private tabs will be removed from this device
</message>

<message name="IDS_CLOSE_ALL_TABS_AND_GROUPS_DIALOG_MESSAGE_WITH_INCOGNITO_TABS" desc="Description of the action of closing all tabs and group, shown in a confirmation dialog. If there are any Private tabs opened this message would warn users that those Private tabs would be lost.">
{INCOGNITO_TABS_COUNT, plural,
=1 {Your closed tabs and groups can be reopened from the Recent tabs section and the Tab groups section. Your Private tab won't be available.}
other {Your closed tabs and groups can be reopened from the Recent tabs section and the Tab groups section. Your # Private tabs won't be available.}}
</message>
</messages>
</release>
</grit>
9 changes: 6 additions & 3 deletions android/java/apk_for_test.flags
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
*** mMvTilesContainerLayout;
*** mLogoCoordinator;
*** insertSiteSectionView(...);
*** isScrollableMvtEnabled(...);
*** setSearchProviderTopMargin(...);
*** setSearchProviderBottomMargin(...);
*** getLogoMargin(...);
Expand Down Expand Up @@ -122,7 +121,7 @@
public <init>(...);
*** mBottomControlsCoordinatorSupplier;
*** mCallbackController;
*** mBrowserControlsSizer;
*** mBottomControlsStacker;
*** mFullscreenManager;
*** mActivityTabProvider;
*** mAppThemeColorProvider;
Expand Down Expand Up @@ -293,7 +292,7 @@
<init>(...);
*** mBottomControlsHeight;
*** mModel;
*** mBrowserControlsSizer;
*** mBottomControlsStacker;
}

-keep class org.chromium.chrome.browser.toolbar.bottom.BraveBottomControlsMediator {
Expand Down Expand Up @@ -881,3 +880,7 @@
-keep class org.chromium.chrome.browser.password_manager.settings.BraveExportFlow {
public <init>(...);
}

-keep class org.chromium.chrome.browser.suggestions.tile.MostVisitedTilesLayout

-keep class org.chromium.chrome.browser.suggestions.tile.BraveMostVisitedTilesLayoutBase
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package org.chromium.chrome.browser.app.helpers;

import static org.chromium.chrome.browser.content.WebContentsFactory.DEFAULT_NETWORK_HANDLE;
import static org.chromium.ui.base.ViewUtils.dpToPx;

import android.content.Context;
Expand Down Expand Up @@ -114,8 +115,10 @@ private static void downloadImage(String url, final RequestManager requestManage

WebContentsFactory webContentsFactory = new WebContentsFactory();
WebContents webContents =
webContentsFactory.createWebContentsWithWarmRenderer(profile, true);
webContents.downloadImage(new GURL(validUrl), // Url
webContentsFactory.createWebContentsWithWarmRenderer(
profile, true, DEFAULT_NETWORK_HANDLE);
webContents.downloadImage(
new GURL(validUrl), // Url
false, // isFavIcon
WalletConstants.MAX_BITMAP_SIZE_FOR_DOWNLOAD, // maxBitmapSize
false, // bypassCache
Expand All @@ -141,28 +144,49 @@ private static void downloadImage(String url, final RequestManager requestManage
new BitmapDrawable(resources, bestBitmap);
imageFetcherFacade = new ImageFetcherFacade(bitmapDrawable);
}
loadImage(imageFetcherFacade, requestManager, isCircular, roundedCorners,
imageView, customTarget, callback);
loadImage(
imageFetcherFacade,
requestManager,
isCircular,
roundedCorners,
imageView,
customTarget,
callback);
});
} else {
ImageFetcher imageFetcher = ImageFetcherFactory.createImageFetcher(
ImageFetcherConfig.NETWORK_ONLY, profile.getProfileKey());
ImageFetcher imageFetcher =
ImageFetcherFactory.createImageFetcher(
ImageFetcherConfig.NETWORK_ONLY, profile.getProfileKey());
if (isGif(url)) {
imageFetcher.fetchGif(
Params.create(new GURL(url), UNUSED_CLIENT_NAME), gifImage -> {
Params.create(new GURL(url), UNUSED_CLIENT_NAME),
gifImage -> {
ImageFetcherFacade imageFetcherFacade =
new ImageFetcherFacade(gifImage.getData());
loadImage(imageFetcherFacade, requestManager, isCircular,
roundedCorners, imageView, customTarget, callback);
loadImage(
imageFetcherFacade,
requestManager,
isCircular,
roundedCorners,
imageView,
customTarget,
callback);
});
} else {
imageFetcher.fetchImage(
Params.create(new GURL(url), UNUSED_CLIENT_NAME), bitmap -> {
Params.create(new GURL(url), UNUSED_CLIENT_NAME),
bitmap -> {
BitmapDrawable bitmapDrawable = new BitmapDrawable(resources, bitmap);
ImageFetcherFacade imageFetcherFacade =
new ImageFetcherFacade(bitmapDrawable);
loadImage(imageFetcherFacade, requestManager, isCircular,
roundedCorners, imageView, customTarget, callback);
loadImage(
imageFetcherFacade,
requestManager,
isCircular,
roundedCorners,
imageView,
customTarget,
callback);
});
}
}
Expand Down
Loading
Loading