Merge pull request #605 from uazo/create-pull-request/patch-957d6e4

Git apply result for master branch
2023-12-14 22:00:39 +05:00
parent 957d6e4629 33ed9c7bba
commit a02c9037d4
8 changed files with 12 additions and 12 deletions
@@ -655,7 +655,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
 --- a/chrome/browser/ui/ui_features.cc
 +++ b/chrome/browser/ui/ui_features.cc
-@@ -383,4 +383,5 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow,
+@@ -398,4 +398,5 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow,
              "StopLoadingAnimationForHiddenWindow",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
@@ -474,7 +474,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
 diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
-@@ -222,6 +222,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -247,6 +247,7 @@ export class SettingsClearBrowsingDataDialogElement extends
         value: () =>
             [loadTimeData.getString('basicPageTitle'),
              loadTimeData.getString('advancedPageTitle'),
@@ -482,7 +482,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
     ],
       },
 
-@@ -332,6 +333,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -366,6 +367,7 @@ export class SettingsClearBrowsingDataDialogElement extends
     }
     this.clearButtonDisabled_ =
         this.getSelectedDataTypes_(tab as HTMLElement).length === 0;
@@ -13,7 +13,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
-@@ -635,6 +635,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -639,6 +639,7 @@ template("chrome_common_apk_or_module_tmpl") {
           [ "//components/crash/core/app:chrome_crashpad_handler_named_as_so" ]
       loadable_modules += [ "$root_out_dir/libchrome_crashpad_handler.so" ]
       library_always_compress += [ "libchrome_crashpad_handler.so" ]
@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
 --- a/chrome/browser/ui/ui_features.cc
 +++ b/chrome/browser/ui/ui_features.cc
-@@ -206,11 +206,7 @@ BASE_FEATURE(kTabHoverCardImageSettings,
+@@ -221,11 +221,7 @@ BASE_FEATURE(kTabHoverCardImageSettings,
 // https://crbug.com/928954
 BASE_FEATURE(kTabHoverCardImages,
              "TabHoverCardImages",
@@ -138,7 +138,7 @@ diff --git a/chrome/browser/installable/installed_webapp_bridge.cc b/chrome/brow
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -1367,4 +1367,5 @@
+@@ -1357,4 +1357,5 @@
           </settings-subpage>
        </template>
       </template>
@@ -8181,7 +8181,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
     if (enable_reporting) {
       sources += [ "../browser/net/reporting_browsertest.cc" ]
     }
-@@ -3694,6 +3716,7 @@ if (!is_android) {
+@@ -3696,6 +3718,7 @@ if (!is_android) {
         ]
       }
 
@@ -8189,7 +8189,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
       if (is_chromeos_ash && enable_extensions) {
         deps +=
             [ "//chromeos/ash/components/network/portal_detector:test_support" ]
-@@ -5962,6 +5985,7 @@ test("unit_tests") {
+@@ -5964,6 +5987,7 @@ test("unit_tests") {
     # All unittests in browser, common, renderer and service.
     "../browser/about_flags_unittest.cc",
     "../browser/accessibility/media_app/ax_media_app_handler_unittest.cc",
@@ -8197,7 +8197,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
     "../browser/after_startup_task_utils_unittest.cc",
     "../browser/apps/icon_standardizer_unittest.cc",
     "../browser/apps/user_type_filter_unittest.cc",
-@@ -6641,6 +6665,8 @@ test("unit_tests") {
+@@ -6643,6 +6667,8 @@ test("unit_tests") {
     "//chrome/services/file_util:unit_tests",
     "//chrome/services/qrcode_generator/public/cpp",
     "//components/account_id",
@@ -8206,7 +8206,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
     "//components/assist_ranker/proto",
     "//components/autofill/content/browser:test_support",
     "//components/background_sync",
-@@ -10158,6 +10184,7 @@ if (!is_android) {
+@@ -10160,6 +10186,7 @@ if (!is_android) {
 
     public_deps = [
       "//chrome/browser:test_support_ui",
@@ -4120,7 +4120,7 @@ diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/c
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -3716,6 +3716,12 @@ if (!is_android) {
+@@ -3718,6 +3718,12 @@ if (!is_android) {
         ]
       }
 
@@ -784,7 +784,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -6594,7 +6594,6 @@ test("unit_tests") {
+@@ -6596,7 +6596,6 @@ test("unit_tests") {
     "//chrome/browser/favicon",
     "//chrome/browser/feature_guide/notifications:unit_tests",
     "//chrome/browser/first_party_sets",