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 121.0.6167.57 to Chromium 121.0.6167.75 (1.63.x). #21601

Merged
merged 5 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 86 additions & 9 deletions app/generated_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -7385,6 +7385,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_NTP_CUSTOMIZE_COLOR_HUE_SLIDER_TITLE" desc="The label for the hue slider in the customization menu on the New Tab Page that allows a user to pick a color for their theme">
Color picker
</message>
<message name="IDS_NTP_CUSTOMIZE_COLOR_HUE_SLIDER_DELETE_TITLE" translateable="false" desc="The tooltip for the delete button in the hue slider that unselects the currently selected hue.">
Unselect
</message>
<message name="IDS_NTP_CUSTOMIZE_COLOR_HUE_SLIDER_DELETE_A11Y_LABEL" translateable="false" desc="The accessibility label for the delete button in the hue slider that unselects the currently selected hue.">
Unselect color
</message>
<message name="IDS_NTP_THEME_MANAGED_DIALOG_TITLE" desc="Title text for the dialog informing users that their theme is managed when they try selecting a theme on the New Tab Page.">
Theme is set by your Organization
</message>
Expand Down Expand Up @@ -7541,9 +7547,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_HEADER" desc="Header for the wallpaper search section for showing past themes.">
Your recent AI themes
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_TILE_TITLE" desc="Title for each tile button in the wallpaper search section for showing past themes.">
Recent AI theme <ph name="TILE_INDEX">$1<ex>2</ex></ph>
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_OFFLINE_DESCRIPTION" desc="The description of the message displayed by wallpaper search when the browser is offline.">
Check your internet and try again.
</message>
Expand Down Expand Up @@ -7583,27 +7586,51 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_NTP_WALLPAPER_SEARCH_TRY_AGAIN_CTA" desc="Call to action displayed when wallpaper search fails that asks user to try again.">
Try again
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL_NO_DESCRIPTOR" translateable="false" desc="Accessibility label for a wallpaper search history result, with only the index.">
Recent AI theme <ph name="INDEX">$1<ex>2</ex></ph>
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL" translateable="false" desc="Accessibility label for a wallpaper search history result, with only descriptor A.">
Recent AI theme <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL_WITH_DESCRIPTOR_B" translateable="false" desc="Accessibility label for a wallpaper search history result, with descriptors A and B.">
Recent AI theme <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>, in <ph name="STYLE">$3</ph> style
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL_WITH_DESCRIPTOR_C" translateable="false" desc="Accessibility label for a wallpaper search history result, with descriptors A and C.">
Recent AI theme <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>, with <ph name="MOOD">$3</ph> mood.
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL_WITH_DESCRIPTORS_B_AND_C" translateable="false" desc="Accessibility label for a wallpaper search history result, with descriptors A, B, and C.">
Recent AI theme <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>, in <ph name="STYLE">$3</ph> style, with <ph name="MOOD">$4</ph> mood.
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_RESULT_LABEL" desc="Accessibility label for a wallpaper search result, with only descriptor A.">
Image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="A">$2</ph>
Generated image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_RESULT_LABEL_WITH_DESCRIPTOR_B" desc="Accessibility label for a wallpaper search result, with descriptors A and B.">
Image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="A">$2</ph>, in <ph name="B">$3</ph> style
Generated image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>, in <ph name="STYLE">$3</ph> style
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_RESULT_LABEL_WITH_DESCRIPTOR_C" desc="Accessibility label for a wallpaper search result, with descriptors A and C.">
Image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="A">$2</ph>, with <ph name="C">$3</ph> mood.
Generated image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>, with <ph name="MOOD">$3</ph> mood.
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_RESULT_LABEL_WITH_DESCRIPTORS_B_AND_C" desc="Accessibility label for a wallpaper search result, with descriptors A, B, and C.">
Image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="A">$2</ph>, in <ph name="B">$3</ph> style, with <ph name="C">$4</ph> mood.
Generated image <ph name="INDEX">$1<ex>2</ex></ph> of <ph name="SUBJECT">$2</ph>, in <ph name="STYLE">$3</ph> style, with <ph name="MOOD">$4</ph> mood.
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_SUBJECT_LABEL" desc="Label for the Create theme with AI dropdown for selecting subject of the image.">
Subject
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_SUBJECT_DEFAULT_OPTION_LABEL" translateable="false" desc="Label for the option that a user can pick to unselect a previously selected subject. Also serves as a heading and label for the whole dropdown.">
Choose a subject
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_MOOD_LABEL" desc="Label for the Create theme with AI dropdown for selecting mood of the image.">
Mood
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_MOOD_DEFAULT_OPTION_LABEL" translateable="false" desc="Label for the option that a user can pick to unselect a previously selected mood. Also serves as a heading and label for the whole dropdown.">
Choose a mood
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_STYLE_LABEL" desc="Label for the Create theme with AI dropdown for selecting style of the image.">
Style
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_STYLE_DEFAULT_OPTION_LABEL" translateable="false" desc="Label for the option that a user can pick to unselect a previously selected style. Also serves as a heading and label for the whole dropdown.">
Choose a style
</message>
<message name="IDS_LEARN_MORE_ABOUT_FEATURE_A11Y_LABEL" desc="Accessibility label for a link labeled 'Learn more' that links to a help article about creating themes with AI.">
Learn more about creating themes with AI.
</message>
Expand All @@ -7616,6 +7643,18 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_NTP_WALLPAPER_SEARCH_INSPIRATION_HEADER" desc="Header for the wallpaper search section for showing example results.">
Inspiration
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_LOADING_A11Y_MESSAGE" translateable="false" desc="Accessibility string read to screen reader users that images are being created.">
Generating...
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_SUCCESS_A11Y_MESSAGE" translateable="false" desc="Accessibility string read to screen reader users that images are being created.">
Generated <ph name="COUNT">$1<ex>2</ex></ph> images
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_DISCLAIMER" translateable="false" desc="Disclaimer text used for the Create theme with AI feature.">
This is an experimental AI feature and won't always get it right.
</message>
<message name="IDS_NTP_WALLPAPER_SEARCH_MEADOW_INSPIRATION_TITLE" translateable="false" desc="Title for the wallpaper search's Meadow inspiration.">
Meadow, Oil Painting, Intellectual, Yellow
</message>

<!-- NTP Modules -->
<message name="IDS_NTP_MODULES_INFO_BUTTON_TITLE" desc="Text shown in tooltip of info button of an NTP module.">
Expand Down Expand Up @@ -8782,6 +8821,17 @@ Keep your key file in a safe place. You will need it to create new versions of y
Select the tab group and activate the context menu to edit
</message>

<!-- Strings for experimental AI promo -->
<message name="IDS_IPH_EXPERIMENTAL_AI_PROMO" desc="The title text of the IPH promo for experimental AI." translateable="false">
Try out experimental AI features
</message>
<message name="IDS_IPH_EXPERIMENTAL_AI_PROMO_BODY" desc="The body text of the IPH promo for experimental AI." translateable="false">
Get help organizing tabs and creating custom themes
</message>
<message name="IDS_IPH_EXPERIMENTAL_AI_PROMO_BUTTON_CONTINUE" desc="The text of the continue button for the experimental AI IPH promo." translateable="false">
Continue
</message>

<!-- Strings for intent picker -->
<if expr="not is_android">
<message name="IDS_TOOLTIP_INTENT_PICKER_ICON" desc="The tooltip for the intent picker bubble icon">
Expand Down Expand Up @@ -10331,6 +10381,21 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Brave P
<message name="IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_SYNC_PAUSED" desc="The label for the button in the not started state of the tab organization UI, when sync is paused" translateable="false">
Sign in
</message>
<message name="IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_ARIA_LABEL" desc="The a11y label for the button in the not started state of the tab organization UI, when synced" is_accessibility_with_no_ui="true">
Check now if tabs can be organized
</message>
<message name="IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_FRE_ARIA_LABEL" desc="The first run experience a11y label for the button in the not started state of the tab organization UI, when synced" is_accessibility_with_no_ui="true">
Let's go and organize your tabs
</message>
<message name="IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_UNSYNCED_ARIA_LABEL" desc="The a11y label for the button in the not started state of the tab organization UI, when not signed in or signed in but unsynced" is_accessibility_with_no_ui="true">
Turn on sync to let Brave suggest tab groups
</message>
<message name="IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_UNSYNCED_HISTORY_ARIA_LABEL" desc="The a11y label for the button in the not started state of the tab organization UI, when history sync is disabled" is_accessibility_with_no_ui="true">
Open settings to let Brave suggest tab groups
</message>
<message name="IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_SYNC_PAUSED_ARIA_LABEL" desc="The a11y label for the button in the not started state of the tab organization UI, when sync is paused" is_accessibility_with_no_ui="true">
Sign in to let Brave suggest tab groups
</message>
<message name="IDS_TAB_ORGANIZATION_IN_PROGRESS_TITLE" desc="The header text for the in progress state in the tab organization UI" translateable="false">
Organizing into a tab group…
</message>
Expand Down Expand Up @@ -10370,7 +10435,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Brave P
<message name="IDS_TAB_ORGANIZATION_TIP_ACTION" desc="The actionable text of the tip in the tab organization UI" translateable="false">
Show me how
</message>
<message name="IDS_TAB_ORGANIZATION_TIP_ARIA_DESCRIPTION" desc="The a11y description of the tip in the tab organization UI" translateable="false" is_accessibility_with_no_ui="true">
<message name="IDS_TAB_ORGANIZATION_TIP_ARIA_DESCRIPTION" desc="The a11y label of the tip in the tab organization UI" translateable="false" is_accessibility_with_no_ui="true">
Launch tab group tutorial
</message>
<message name="IDS_TAB_ORGANIZATION_DISCLAIMER" desc="The disclaimer text in the tab organization UI results state for getting more information" translateable="false">
Expand All @@ -10379,7 +10444,10 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Brave P
<message name="IDS_TAB_ORGANIZATION_LEARN_MORE" desc="The actionable text in the tab organization UI results state for getting more information" translateable="false">
Learn more
</message>
<message name="IDS_TAB_ORGANIZATION_CLOSE_TAB_ARIA_LABEL" desc="The accessible label in the tab organization UI results state for removing a tab" translateable="false" is_accessibility_with_no_ui="true">
<message name="IDS_TAB_ORGANIZATION_LEARN_MORE_ARIA_LABEL" desc="The accessible label in the tab organization UI results state for getting more information" is_accessibility_with_no_ui="true">
Learn more about using AI tools
</message>
<message name="IDS_TAB_ORGANIZATION_CLOSE_TAB_ARIA_LABEL" desc="The accessible label in the tab organization UI results state for removing a tab" is_accessibility_with_no_ui="true">
Remove <ph name="TAB_TITLE">$1<ex>New Tab</ex></ph> from tab group
</message>
<message name="IDS_TAB_ORGANIZATION_CLOSE_TAB_TOOLTIP" desc="Tooltip on the button in the tab organization UI results state for removing a tab" translateable="false">
Expand All @@ -10391,6 +10459,15 @@ Check your passwords anytime in <ph name="GOOGLE_PASSWORD_MANAGER">$1<ex>Brave P
<message name="IDS_TAB_ORGANIZATION_REJECT_FINAL_SUGGESTION" desc="The button text in the tab organization UI results state for rejecting the current (and final) suggestion" translateable="false">
Clear
</message>
<message name="IDS_TAB_ORGANIZATION_INPUT_ARIA_LABEL" desc="The a11y label of the tab group name input in the tab organization UI" is_accessibility_with_no_ui="true">
Tab group name: <ph name="NAME">$1<ex>My tab group</ex></ph>
</message>
<message name="IDS_TAB_ORGANIZATION_THUMBS_DOWN" desc="Accessibility label for the thumbs down icon that a user can click to provide negative feedback about a tab organization." is_accessibility_with_no_ui="true">
Thumbs down submits feedback that you dislike this tab group suggestion
</message>
<message name="IDS_TAB_ORGANIZATION_THUMBS_UP" desc="Accessibility label for the thumbs up icon that a user can click to provide positive feedback about a tab organization." is_accessibility_with_no_ui="true">
Thumbs up submits feedback that you like this tab group suggestion
</message>

<!-- Strings for Window Titles in Menus -->
<if expr="not use_titlecase">
Expand Down
2 changes: 1 addition & 1 deletion app/settings_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -4345,7 +4345,7 @@
Enables autofill helper on certain input fields
</message>
<message name="IDS_SETTINGS_EXPERIMENTAL_ADVANCED_FEATURE2_LABEL" desc="Toggle primary description" translateable="false">
Tab Organizer
Tab organizer
</message>
<message name="IDS_SETTINGS_EXPERIMENTAL_ADVANCED_FEATURE2_SUBLABEL" desc="Toggle secondary description" translateable="false">
Automatically creates tab groups based on your open tabs. To use this feature, right-click on a tab and click Organize similar tabs.
Expand Down
7 changes: 4 additions & 3 deletions browser/ui/views/brave_tab_search_bubble_host.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ void BraveTabSearchBubbleHost::SetBubbleArrow(
}

bool BraveTabSearchBubbleHost::ShowTabSearchBubble(
bool triggered_by_keyboard_shortcut) {
bool result =
TabSearchBubbleHost::ShowTabSearchBubble(triggered_by_keyboard_shortcut);
bool triggered_by_keyboard_shortcut,
int tab_index) {
bool result = TabSearchBubbleHost::ShowTabSearchBubble(
triggered_by_keyboard_shortcut, tab_index);
if (!arrow_ || !result) {
return result;
}
Expand Down
4 changes: 2 additions & 2 deletions browser/ui/views/brave_tab_search_bubble_host.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class BraveTabSearchBubbleHost : public TabSearchBubbleHost {
void SetBubbleArrow(views::BubbleBorder::Arrow arrow);

// TabSearchBubbleHost:
bool ShowTabSearchBubble(
bool triggered_by_keyboard_shortcut = false) override;
bool ShowTabSearchBubble(bool triggered_by_keyboard_shortcut = false,
int tab_index = -1) override;

private:
std::optional<views::BubbleBorder::Arrow> arrow_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -549,9 +549,9 @@ bool ParseCertificatesFile(std::string_view certs_input,
Pinsets* pinsets,
base::Time* timestamp) {
constexpr std::string_view brave_certs = R"brave_certs(
# Last updated: Wed Jan 10 01:26:30 UTC 2024
# Last updated: Wed Jan 17 19:58:09 UTC 2024
PinsListTimestamp
1704849990
1705521489

# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
Expand Down
6 changes: 6 additions & 0 deletions components/site_settings_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -239,5 +239,11 @@
<message name="IDS_SITE_SETTINGS_TYPE_WINDOW_MANAGEMENT_MID_SENTENCE" desc="The label used for the window management site settings controls when used mid-sentence.">
window management
</message>
<message name="IDS_SITE_SETTINGS_TYPE_PERFORMANCE" desc="The label used for the performance site settings controls.">
Performance
</message>
<message name="IDS_SITE_SETTINGS_TYPE_PERFORMANCE_SUBLABEL" desc="The sublabel used for the performance site settings controls to manage the exclusion list.">
Manage sites that will always stay active and won't have memory freed up from them
</message>
</if>
</grit-part>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "121.0.6167.57",
"tag": "121.0.6167.75",
"repository": {
"url": "https://github.com/brave/chromium"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml
index 7fa97b7ab9d3b813db3408f6bc252681b3cb6fa5..6361954b78d82e6f49ac85f97e3a81a2583ba173 100644
index 7fa97b7ab9d3b813db3408f6bc252681b3cb6fa5..976a8d704700ed81c68e45553e464f056ab0a32a 100644
--- a/chrome/android/expectations/lint-suppressions.xml
+++ b/chrome/android/expectations/lint-suppressions.xml
@@ -269,4 +269,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 655429c1daa7bf68ddf90809c4789ef72a3decb4..8348cf73b19ce31a87e5cce7d85ab92ceca2d956 100644
index afdf577837a494a354fb6045864fb462de379f96..109ad10fcf6ae2340ebd9a15e2886a5075438cd4 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2692,6 +2692,7 @@ static_library("browser") {
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-about_flags.cc.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index ae88943acc26f3d04fc68ac192911c57c9a602cd..913b0533cb350b2db6b476f7b6caf1b947b54eaf 100644
index 2a2fde6ab7d90ddc19ff56690197f0380bf6c91e..2cdaf823e4a565c9858e48bb4fa624a0ff6d7865 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3960,6 +3960,7 @@ const flags_ui::FeatureEntry::FeatureVariation
@@ -3971,6 +3971,7 @@ const flags_ui::FeatureEntry::FeatureVariation
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts
index 83cac6858b32189269e0ed8198d4f84d882569e6..cb03bc31f592d1ebf28e3489ec670e5a3a9b4744 100644
index 5770ecfa63538c064144fdc12feb34925d7c65c4..517787c3670f99ca685cee5247ce0281aaf8d2a7 100644
--- a/chrome/browser/resources/settings/site_settings/constants.ts
+++ b/chrome/browser/resources/settings/site_settings/constants.ts
@@ -55,6 +55,7 @@ export enum ContentSettingsTypes {
@@ -56,6 +56,7 @@ export enum ContentSettingsTypes {
// are used everywhere where ContentSettingsTypes is used in JS.
PDF_DOCUMENTS = 'pdfDocuments',
SITE_DATA = 'site-data',
Expand Down
Loading