Loading build/GN_ARGS +2 −0 Original line number Diff line number Diff line Loading @@ -21,6 +21,7 @@ enable_platform_hevc=true enable_remoting=false enable_reporting=true enable_vr=false exclude_unwind_tables=false ffmpeg_branding="Chrome" fieldtrial_testing_like_official_build=true icu_use_data_file=true Loading @@ -37,5 +38,6 @@ use_errorprone_java_compiler=false use_gnome_keyring=false use_official_google_api_keys=false use_openh264=true use_rtti=false use_sysroot=false webview_includes_weblayer=false build/RELEASE +1 −1 Original line number Diff line number Diff line 88.0.4324.187 88.0.4324.207 build/bromite_patches_list.txt +2 −0 Original line number Diff line number Diff line Loading @@ -158,4 +158,6 @@ Ignore-enterprise-policies-for-secure-DNS.patch Fix-favicons-fallback-search.patch Enable-app-overflow-menu-icons-by-default.patch Add-menu-item-to-bookmark-all-tabs.patch Add-flag-for-save-data-header.patch Add-option-to-force-tablet-UI.patch Automated-domain-substitution.patch build/patches/Add-exit-menu-item.patch +7 −6 Original line number Diff line number Diff line Loading @@ -4,27 +4,28 @@ Subject: Add exit menu item Corrected Exit functionality --- chrome/android/java/res/menu/main_menu.xml | 4 ++++ chrome/android/java/res/menu/main_menu.xml | 5 +++++ chrome/android/java/res/menu/main_menu_regroup.xml | 3 +++ .../org/chromium/chrome/browser/ChromeTabbedActivity.java | 3 +++ .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 6 ++++++ .../chrome/browser/init/ChromeLifetimeController.java | 6 +++++- .../browser/ui/android/strings/android_chrome_strings.grd | 3 +++ 6 files changed, 24 insertions(+), 1 deletion(-) 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml +++ b/chrome/android/java/res/menu/main_menu.xml @@ -119,6 +119,8 @@ @@ -119,6 +119,9 @@ android:icon="@drawable/vr_headset" /> <item android:id="@+id/managed_by_menu_id" android:title="@string/managed" /> + <item android:id="@+id/exit_id" + android:title="@string/menu_exit" /> + android:title="@string/menu_exit" + android:icon="@drawable/ic_exit_to_app_white_24dp" /> </group> <!-- Items shown only in the tab switcher --> @@ -153,6 +155,8 @@ @@ -153,6 +156,8 @@ <item android:id="@id/preferences_id" android:title="@string/menu_settings" android:icon="@drawable/settings_cog" /> Loading build/patches/Add-flag-for-save-data-header.patch 0 → 100644 +99 −0 Original line number Diff line number Diff line From: Wengling Chen <feiyu2817@gmail.com> Date: Mon, 1 Feb 2021 19:18:55 +0200 Subject: Add flag for save-data-header --- chrome/browser/about_flags.cc | 4 ++++ chrome/browser/flag_descriptions.cc | 4 ++++ chrome/browser/flag_descriptions.h | 3 +++ content/browser/loader/browser_initiated_resource_request.cc | 5 +++-- services/network/public/cpp/features.cc | 4 ++++ services/network/public/cpp/features.h | 2 ++ 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -4302,6 +4302,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kDisableKeepaliveFetchDescription, kOsAll, FEATURE_VALUE_TYPE(network::features::kDisableKeepaliveFetch)}, + {"enable-save-data-header", flag_descriptions::kEnableSaveDataHeaderName, + flag_descriptions::kEnableSaveDataHeaderDescription, kOsAndroid, + FEATURE_VALUE_TYPE(network::features::kEnableSaveDataHeader)}, + {"delay-async-script-execution", flag_descriptions::kDelayAsyncScriptExecutionName, flag_descriptions::kDelayAsyncScriptExecutionDescription, kOsAll, diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc @@ -904,6 +904,10 @@ const char kDisableKeepaliveFetchDescription[] = "Disable fetch with keepalive set " "(https://fetch.spec.whatwg.org/#request-keepalive-flag)."; +const char kEnableSaveDataHeaderName[] = "Enable save-data header"; +const char kEnableSaveDataHeaderDescription[] = + "Enable save-data header without enabling Data Saver."; + const char kExperimentalAccessibilityLanguageDetectionName[] = "Experimental accessibility language detection"; const char kExperimentalAccessibilityLanguageDetectionDescription[] = diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h @@ -510,6 +510,9 @@ extern const char kDiagnosticsAppDescription[]; extern const char kDisableKeepaliveFetchName[]; extern const char kDisableKeepaliveFetchDescription[]; +extern const char kEnableSaveDataHeaderName[]; +extern const char kEnableSaveDataHeaderDescription[]; + extern const char kMemlogName[]; extern const char kMemlogDescription[]; extern const char kMemlogModeMinimal[]; diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/content/browser/loader/browser_initiated_resource_request.cc --- a/content/browser/loader/browser_initiated_resource_request.cc +++ b/content/browser/loader/browser_initiated_resource_request.cc @@ -40,9 +40,10 @@ void UpdateAdditionalHeadersForBrowserInitiatedRequest( // Set the Save-Data header if appropriate. // https://tools.ietf.org/html/draft-grigorik-http-client-hints-03#section-7 - if (GetContentClient()->browser()->IsDataSaverEnabled(browser_context) && + if ((GetContentClient()->browser()->IsDataSaverEnabled(browser_context) && !base::GetFieldTrialParamByFeatureAsBool(features::kDataSaverHoldback, - "holdback_web", false)) { + "holdback_web", false)) || + base::FeatureList::IsEnabled(network::features::kEnableSaveDataHeader)) { if (should_update_existing_headers) { headers->RemoveHeader("Save-Data"); } diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc @@ -150,6 +150,10 @@ const base::FeatureParam<std::string> const base::Feature kDisableKeepaliveFetch{"DisableKeepaliveFetch", base::FEATURE_DISABLED_BY_DEFAULT}; +// Enable save-data header seprately, without enabled data reduction service +const base::Feature kEnableSaveDataHeader{"EnableSaveDataHeader", + base::FEATURE_DISABLED_BY_DEFAULT}; + // Attach the origin of the destination URL to the "origin" header const base::Feature kDeriveOriginFromUrlForNeitherGetNorHeadRequestWhenHavingSpecialAccess{ diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h --- a/services/network/public/cpp/features.h +++ b/services/network/public/cpp/features.h @@ -58,6 +58,8 @@ extern const base::FeatureParam<std::string> COMPONENT_EXPORT(NETWORK_CPP) extern const base::Feature kDisableKeepaliveFetch; COMPONENT_EXPORT(NETWORK_CPP) +extern const base::Feature kEnableSaveDataHeader; +COMPONENT_EXPORT(NETWORK_CPP) extern const base::Feature kDeriveOriginFromUrlForNeitherGetNorHeadRequestWhenHavingSpecialAccess; COMPONENT_EXPORT(NETWORK_CPP) -- 2.17.1 Loading
build/GN_ARGS +2 −0 Original line number Diff line number Diff line Loading @@ -21,6 +21,7 @@ enable_platform_hevc=true enable_remoting=false enable_reporting=true enable_vr=false exclude_unwind_tables=false ffmpeg_branding="Chrome" fieldtrial_testing_like_official_build=true icu_use_data_file=true Loading @@ -37,5 +38,6 @@ use_errorprone_java_compiler=false use_gnome_keyring=false use_official_google_api_keys=false use_openh264=true use_rtti=false use_sysroot=false webview_includes_weblayer=false
build/bromite_patches_list.txt +2 −0 Original line number Diff line number Diff line Loading @@ -158,4 +158,6 @@ Ignore-enterprise-policies-for-secure-DNS.patch Fix-favicons-fallback-search.patch Enable-app-overflow-menu-icons-by-default.patch Add-menu-item-to-bookmark-all-tabs.patch Add-flag-for-save-data-header.patch Add-option-to-force-tablet-UI.patch Automated-domain-substitution.patch
build/patches/Add-exit-menu-item.patch +7 −6 Original line number Diff line number Diff line Loading @@ -4,27 +4,28 @@ Subject: Add exit menu item Corrected Exit functionality --- chrome/android/java/res/menu/main_menu.xml | 4 ++++ chrome/android/java/res/menu/main_menu.xml | 5 +++++ chrome/android/java/res/menu/main_menu_regroup.xml | 3 +++ .../org/chromium/chrome/browser/ChromeTabbedActivity.java | 3 +++ .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 6 ++++++ .../chrome/browser/init/ChromeLifetimeController.java | 6 +++++- .../browser/ui/android/strings/android_chrome_strings.grd | 3 +++ 6 files changed, 24 insertions(+), 1 deletion(-) 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml +++ b/chrome/android/java/res/menu/main_menu.xml @@ -119,6 +119,8 @@ @@ -119,6 +119,9 @@ android:icon="@drawable/vr_headset" /> <item android:id="@+id/managed_by_menu_id" android:title="@string/managed" /> + <item android:id="@+id/exit_id" + android:title="@string/menu_exit" /> + android:title="@string/menu_exit" + android:icon="@drawable/ic_exit_to_app_white_24dp" /> </group> <!-- Items shown only in the tab switcher --> @@ -153,6 +155,8 @@ @@ -153,6 +156,8 @@ <item android:id="@id/preferences_id" android:title="@string/menu_settings" android:icon="@drawable/settings_cog" /> Loading
build/patches/Add-flag-for-save-data-header.patch 0 → 100644 +99 −0 Original line number Diff line number Diff line From: Wengling Chen <feiyu2817@gmail.com> Date: Mon, 1 Feb 2021 19:18:55 +0200 Subject: Add flag for save-data-header --- chrome/browser/about_flags.cc | 4 ++++ chrome/browser/flag_descriptions.cc | 4 ++++ chrome/browser/flag_descriptions.h | 3 +++ content/browser/loader/browser_initiated_resource_request.cc | 5 +++-- services/network/public/cpp/features.cc | 4 ++++ services/network/public/cpp/features.h | 2 ++ 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -4302,6 +4302,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kDisableKeepaliveFetchDescription, kOsAll, FEATURE_VALUE_TYPE(network::features::kDisableKeepaliveFetch)}, + {"enable-save-data-header", flag_descriptions::kEnableSaveDataHeaderName, + flag_descriptions::kEnableSaveDataHeaderDescription, kOsAndroid, + FEATURE_VALUE_TYPE(network::features::kEnableSaveDataHeader)}, + {"delay-async-script-execution", flag_descriptions::kDelayAsyncScriptExecutionName, flag_descriptions::kDelayAsyncScriptExecutionDescription, kOsAll, diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc @@ -904,6 +904,10 @@ const char kDisableKeepaliveFetchDescription[] = "Disable fetch with keepalive set " "(https://fetch.spec.whatwg.org/#request-keepalive-flag)."; +const char kEnableSaveDataHeaderName[] = "Enable save-data header"; +const char kEnableSaveDataHeaderDescription[] = + "Enable save-data header without enabling Data Saver."; + const char kExperimentalAccessibilityLanguageDetectionName[] = "Experimental accessibility language detection"; const char kExperimentalAccessibilityLanguageDetectionDescription[] = diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h @@ -510,6 +510,9 @@ extern const char kDiagnosticsAppDescription[]; extern const char kDisableKeepaliveFetchName[]; extern const char kDisableKeepaliveFetchDescription[]; +extern const char kEnableSaveDataHeaderName[]; +extern const char kEnableSaveDataHeaderDescription[]; + extern const char kMemlogName[]; extern const char kMemlogDescription[]; extern const char kMemlogModeMinimal[]; diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/content/browser/loader/browser_initiated_resource_request.cc --- a/content/browser/loader/browser_initiated_resource_request.cc +++ b/content/browser/loader/browser_initiated_resource_request.cc @@ -40,9 +40,10 @@ void UpdateAdditionalHeadersForBrowserInitiatedRequest( // Set the Save-Data header if appropriate. // https://tools.ietf.org/html/draft-grigorik-http-client-hints-03#section-7 - if (GetContentClient()->browser()->IsDataSaverEnabled(browser_context) && + if ((GetContentClient()->browser()->IsDataSaverEnabled(browser_context) && !base::GetFieldTrialParamByFeatureAsBool(features::kDataSaverHoldback, - "holdback_web", false)) { + "holdback_web", false)) || + base::FeatureList::IsEnabled(network::features::kEnableSaveDataHeader)) { if (should_update_existing_headers) { headers->RemoveHeader("Save-Data"); } diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc @@ -150,6 +150,10 @@ const base::FeatureParam<std::string> const base::Feature kDisableKeepaliveFetch{"DisableKeepaliveFetch", base::FEATURE_DISABLED_BY_DEFAULT}; +// Enable save-data header seprately, without enabled data reduction service +const base::Feature kEnableSaveDataHeader{"EnableSaveDataHeader", + base::FEATURE_DISABLED_BY_DEFAULT}; + // Attach the origin of the destination URL to the "origin" header const base::Feature kDeriveOriginFromUrlForNeitherGetNorHeadRequestWhenHavingSpecialAccess{ diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h --- a/services/network/public/cpp/features.h +++ b/services/network/public/cpp/features.h @@ -58,6 +58,8 @@ extern const base::FeatureParam<std::string> COMPONENT_EXPORT(NETWORK_CPP) extern const base::Feature kDisableKeepaliveFetch; COMPONENT_EXPORT(NETWORK_CPP) +extern const base::Feature kEnableSaveDataHeader; +COMPONENT_EXPORT(NETWORK_CPP) extern const base::Feature kDeriveOriginFromUrlForNeitherGetNorHeadRequestWhenHavingSpecialAccess; COMPONENT_EXPORT(NETWORK_CPP) -- 2.17.1