Pārlūkot izejas kodu

Update to Chromium 97.0.4692.99 (#1806)

Ahrotahn 2 gadi atpakaļ
vecāks
revīzija
e71cd1ed55

+ 1 - 1
chromium_version.txt

@@ -1 +1 @@
-97.0.4692.71
+97.0.4692.99

+ 2 - 2
patches/core/ungoogled-chromium/disable-privacy-sandbox.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
 +++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
-@@ -378,7 +378,7 @@ std::vector<GURL> PrivacySandboxSettings
+@@ -369,7 +369,7 @@ std::vector<GURL> PrivacySandboxSettings
  }
  
  bool PrivacySandboxSettings::IsPrivacySandboxAllowed() {
@@ -9,7 +9,7 @@
  }
  
  bool PrivacySandboxSettings::IsPrivacySandboxEnabled() {
-@@ -390,8 +390,6 @@ bool PrivacySandboxSettings::IsPrivacySa
+@@ -381,8 +381,6 @@ bool PrivacySandboxSettings::IsPrivacySa
  }
  
  void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) {

+ 7 - 7
patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch

@@ -1123,7 +1123,7 @@
  
  #if defined(OS_ANDROID)
  #include "chrome/browser/android/tab_android.h"
-@@ -826,6 +825,7 @@ autofill::LanguageCode ChromePasswordMan
+@@ -828,6 +827,7 @@ autofill::LanguageCode ChromePasswordMan
    return autofill::LanguageCode();
  }
  
@@ -1131,7 +1131,7 @@
  safe_browsing::PasswordProtectionService*
  ChromePasswordManagerClient::GetPasswordProtectionService() const {
    return safe_browsing::ChromePasswordProtectionService::
-@@ -836,13 +836,6 @@ ChromePasswordManagerClient::GetPassword
+@@ -838,13 +838,6 @@ ChromePasswordManagerClient::GetPassword
  void ChromePasswordManagerClient::CheckSafeBrowsingReputation(
      const GURL& form_action,
      const GURL& frame_url) {
@@ -1145,7 +1145,7 @@
  }
  #endif  // defined(ON_FOCUS_PING_ENABLED)
  
-@@ -852,22 +845,10 @@ void ChromePasswordManagerClient::CheckP
+@@ -854,22 +847,10 @@ void ChromePasswordManagerClient::CheckP
      const std::vector<password_manager::MatchingReusedCredential>&
          matching_reused_credentials,
      bool password_field_exists) {
@@ -1169,7 +1169,7 @@
  }
  
  #if !defined(OS_ANDROID)
-@@ -1366,9 +1347,11 @@ void ChromePasswordManagerClient::OnPast
+@@ -1383,9 +1364,11 @@ void ChromePasswordManagerClient::OnPast
    }
  
    was_on_paste_called_ = true;
@@ -1182,7 +1182,7 @@
  
  void ChromePasswordManagerClient::RenderFrameCreated(
      content::RenderFrameHost* render_frame_host) {
-@@ -1403,7 +1386,9 @@ void ChromePasswordManagerClient::OnInpu
+@@ -1420,7 +1403,9 @@ void ChromePasswordManagerClient::OnInpu
    if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
      OnPaste();
    } else {
@@ -1192,7 +1192,7 @@
    }
  #endif  // defined(OS_ANDROID)
  }
-@@ -1442,6 +1427,7 @@ bool ChromePasswordManagerClient::IsPass
+@@ -1459,6 +1444,7 @@ bool ChromePasswordManagerClient::IsPass
      is_enabled = false;
    }
  
@@ -1200,7 +1200,7 @@
    // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
    // warnings until user interaction. If the current page has a delayed warning,
    // it'll have a user interaction observer attached. Disable password
-@@ -1452,6 +1438,7 @@ bool ChromePasswordManagerClient::IsPass
+@@ -1469,6 +1455,7 @@ bool ChromePasswordManagerClient::IsPass
      observer->OnPasswordSaveOrAutofillDenied();
      is_enabled = false;
    }

+ 2 - 2
patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch

@@ -5230,7 +5230,7 @@
  #include "components/sync_preferences/testing_pref_service_syncable.h"
 --- a/tools/metrics/histograms/enums.xml
 +++ b/tools/metrics/histograms/enums.xml
-@@ -84626,7 +84626,6 @@ Full version information for the fingerp
+@@ -84630,7 +84630,6 @@ Full version information for the fingerp
    <int value="3" label="kRestoreOnStartup"/>
    <int value="4" label="kURLsToRestoreOnStartup"/>
    <int value="5" label="extensions::pref_names::kExtensions"/>
@@ -5238,7 +5238,7 @@
    <int value="7" label="kSearchProviderOverrides"/>
    <int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
    <int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
-@@ -84641,10 +84640,7 @@ Full version information for the fingerp
+@@ -84645,10 +84644,7 @@ Full version information for the fingerp
    <int value="18" label="kSafeBrowsingIncidentsSent"/>
    <int value="19" label="kSwReporterPromptVersion"/>
    <int value="20" label="kSwReporterPromptReason"/>

+ 1 - 1
pruning.list

@@ -72,7 +72,7 @@ chrome/browser/resources/chromeos/accessibility/select_to_speak/earcons/null_sel
 chrome/browser/resources/media/mei_preload/preloaded_data.pb
 chrome/browser/ui/app_list/search/search_result_ranker/20190722_example_preprocessor_config.pb
 chrome/browser/ui/app_list/search/search_result_ranker/search_ranker_assets/20190923_example_preprocessor_config.pb
-chrome/build/pgo_profiles/chrome-linux-4692-1640701189-f21838a98aa9a4bd13520a4261d2d77cbab9c3f3.profdata
+chrome/build/pgo_profiles/chrome-linux-4692-1641404809-2e9cd7e4fa1c8c41d8f32f8bc0dd52e2646c649a.profdata
 chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/Network Share Test.lnk
 chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/New folder - Shortcut.lnk
 chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/long_name.lnk