no changes, lines changed
This commit is contained in:
@@ -141,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
|
||||
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
|
||||
@@ -7642,6 +7642,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7646,6 +7646,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kMoveTopToolbarToBottomDescription, kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(features::kMoveTopToolbarToBottom)},
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ to enable it.
|
||||
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
|
||||
@@ -7215,6 +7215,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7217,6 +7217,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kFileHandlingIconsDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(blink::features::kFileHandlingIcons)},
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ fonts-fingerprint-mitigation flag, which is active by default.
|
||||
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
|
||||
@@ -9755,6 +9755,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9759,6 +9759,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kClipboardUnsanitizedContentDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(blink::features::kClipboardUnsanitizedContent)},
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
#include "services/media_session/public/cpp/features.h"
|
||||
#include "services/network/public/cpp/features.h"
|
||||
#include "services/network/public/cpp/network_switches.h"
|
||||
@@ -7855,6 +7856,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7859,6 +7860,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(page_info::kPageInfoHideSiteSettings)},
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ keyboard events.
|
||||
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
|
||||
@@ -4862,6 +4862,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4864,6 +4864,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
|
||||
flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
|
||||
|
||||
@@ -6,15 +6,15 @@ Subject: Restore LastTabStandingTracker
|
||||
chrome/browser/BUILD.gn | 10 ++++
|
||||
.../host_content_settings_map_factory.cc | 2 +
|
||||
.../permissions/last_tab_standing_tracker.cc | 59 +++++++++++++++++++
|
||||
.../permissions/last_tab_standing_tracker.h | 40 +++++++++++++
|
||||
.../permissions/last_tab_standing_tracker.h | 41 +++++++++++++
|
||||
.../last_tab_standing_tracker_factory.cc | 35 +++++++++++
|
||||
.../last_tab_standing_tracker_factory.h | 40 +++++++++++++
|
||||
.../last_tab_standing_tracker_observer.h | 24 ++++++++
|
||||
.../last_tab_standing_tracker_observer.h | 25 ++++++++
|
||||
.../last_tab_standing_tracker_tab_helper.cc | 42 +++++++++++++
|
||||
.../last_tab_standing_tracker_tab_helper.h | 37 ++++++++++++
|
||||
...hrome_browser_main_extra_parts_profiles.cc | 2 +
|
||||
chrome/browser/ui/tab_helpers.cc | 2 +
|
||||
11 files changed, 293 insertions(+)
|
||||
11 files changed, 295 insertions(+)
|
||||
create mode 100644 chrome/browser/permissions/last_tab_standing_tracker.cc
|
||||
create mode 100644 chrome/browser/permissions/last_tab_standing_tracker.h
|
||||
create mode 100644 chrome/browser/permissions/last_tab_standing_tracker_factory.cc
|
||||
@@ -130,7 +130,7 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker.h b/chrome/bro
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/chrome/browser/permissions/last_tab_standing_tracker.h
|
||||
@@ -0,0 +1,40 @@
|
||||
@@ -0,0 +1,41 @@
|
||||
+// Copyright 2020 The Chromium Authors
|
||||
+// Use of this source code is governed by a BSD-style license that can be
|
||||
+// found in the LICENSE file.
|
||||
@@ -171,6 +171,7 @@ new file mode 100644
|
||||
+};
|
||||
+
|
||||
+#endif // CHROME_BROWSER_PERMISSIONS_LAST_TAB_STANDING_TRACKER_H_
|
||||
+
|
||||
diff --git a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc b/chrome/browser/permissions/last_tab_standing_tracker_factory.cc
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
@@ -260,7 +261,7 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker_observer.h b/c
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/chrome/browser/permissions/last_tab_standing_tracker_observer.h
|
||||
@@ -0,0 +1,24 @@
|
||||
@@ -0,0 +1,25 @@
|
||||
+// Copyright 2020 The Chromium Authors
|
||||
+// Use of this source code is governed by a BSD-style license that can be
|
||||
+// found in the LICENSE file.
|
||||
@@ -285,6 +286,7 @@ new file mode 100644
|
||||
+};
|
||||
+
|
||||
+#endif // CHROME_BROWSER_PERMISSIONS_LAST_TAB_STANDING_TRACKER_OBSERVER_H_
|
||||
+
|
||||
diff --git a/chrome/browser/permissions/last_tab_standing_tracker_tab_helper.cc b/chrome/browser/permissions/last_tab_standing_tracker_tab_helper.cc
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
|
||||
@@ -609,7 +609,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
||||
+ base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
BASE_FEATURE(kPrivacySandboxAdsAPIs,
|
||||
"PrivacySandboxAdsAPIs",
|
||||
"PrivacySandboxAdsAPIs", // disabled by default
|
||||
diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/third_party/blink/public/platform/web_content_settings_client.h
|
||||
--- a/third_party/blink/public/platform/web_content_settings_client.h
|
||||
+++ b/third_party/blink/public/platform/web_content_settings_client.h
|
||||
|
||||
@@ -34,7 +34,7 @@ The feature is controlled by a feature flag (default enabled)
|
||||
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
|
||||
@@ -7786,6 +7786,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7790,6 +7790,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(paint_preview::kPaintPreviewDemo)},
|
||||
#endif // BUILDFLAG(ENABLE_PAINT_PREVIEW) && BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -87,8 +87,8 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
||||
+ base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
+
|
||||
BASE_FEATURE(kPrivacySandboxAdsAPIs,
|
||||
"PrivacySandboxAdsAPIs",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
"PrivacySandboxAdsAPIs", // disabled by default
|
||||
base::FEATURE_DISABLED_BY_DEFAULT); // in bromite
|
||||
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
|
||||
--- a/third_party/blink/public/common/features.h
|
||||
+++ b/third_party/blink/public/common/features.h
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: WIN ADDTO Add AllowUserCertificates flag
|
||||
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
|
||||
@@ -8981,10 +8981,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8985,10 +8985,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kHttpsUpgradesDescription, kOsDesktop | kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(features::kHttpsUpgrades)},
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ Subject: WIN ADDTO Add bookmark import/export actions
|
||||
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
|
||||
@@ -9202,11 +9202,13 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9206,11 +9206,13 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(net::features::kIsCleartextPermitted)},
|
||||
#endif
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: WIN ADDTO Add flag to disable external intent re
|
||||
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
|
||||
@@ -3629,9 +3629,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -3631,9 +3631,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
|
||||
flag_descriptions::kUiPartialSwapDescription, kOsAll,
|
||||
SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
|
||||
|
||||
@@ -20,7 +20,7 @@ Subject: WIN ADDTO Experimental user scripts support
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -3512,11 +3512,13 @@ static_library("browser") {
|
||||
@@ -3506,11 +3506,13 @@ static_library("browser") {
|
||||
]
|
||||
deps += [ "//chrome/android/modules/dev_ui/provider:native" ]
|
||||
}
|
||||
@@ -42,7 +42,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
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
|
||||
@@ -7882,9 +7882,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7886,9 +7886,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryReorder)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: WIN ADDTO Restore Search Ready Omnibox flag
|
||||
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
|
||||
@@ -9176,9 +9176,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9180,9 +9180,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kDesksTemplatesDescription, kOsCrOS,
|
||||
FEATURE_VALUE_TYPE(ash::features::kDesksTemplates)},
|
||||
#endif
|
||||
|
||||
@@ -111,7 +111,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
|
||||
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
|
||||
@@ -7656,6 +7656,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7660,6 +7660,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kDevicePostureDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kDevicePosture)},
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -5023,7 +5023,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5025,7 +5025,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"force-text-direction", flag_descriptions::kForceTextDirectionName,
|
||||
flag_descriptions::kForceTextDirectionDescription, kOsAll,
|
||||
MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
|
||||
|
||||
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
#include "components/shared_highlighting/core/common/shared_highlighting_features.h"
|
||||
#include "components/signin/core/browser/dice_account_reconcilor_delegate.h"
|
||||
#include "components/signin/public/base/signin_buildflags.h"
|
||||
@@ -9179,6 +9180,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9183,6 +9184,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
kLargeFaviconFromGoogleVariations,
|
||||
"LargeFaviconFromGoogle")},
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -3668,6 +3668,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -3670,6 +3670,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kKioskEnableAppServiceDescription, kOsCrOS,
|
||||
FEATURE_VALUE_TYPE(features::kKioskEnableAppService)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
@@ -39,7 +39,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -5058,6 +5058,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5060,6 +5060,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"enable-tls13-early-data", flag_descriptions::kEnableTLS13EarlyDataName,
|
||||
flag_descriptions::kEnableTLS13EarlyDataDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(net::features::kEnableTLS13EarlyData)},
|
||||
|
||||
@@ -115,7 +115,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -3310,7 +3310,6 @@ static_library("browser") {
|
||||
@@ -3304,7 +3304,6 @@ static_library("browser") {
|
||||
"//chrome/browser/reading_list/android",
|
||||
"//chrome/browser/recent_tabs:jni_headers",
|
||||
"//chrome/browser/safe_browsing/android:safe_browsing_enums",
|
||||
|
||||
@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -9131,6 +9131,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9135,6 +9135,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kWebMidiDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kWebMidi)},
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -1005,7 +1005,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
"//chrome/test/data/android/",
|
||||
"//chrome/test/data/autofill/",
|
||||
"//chrome/test/data/background_sync/",
|
||||
@@ -3445,6 +3453,7 @@ group("jni_headers") {
|
||||
@@ -3444,6 +3452,7 @@ group("jni_headers") {
|
||||
"//chrome/browser/ui/messages/android:jni_headers",
|
||||
"//chrome/browser/util:jni_headers",
|
||||
"//chrome/browser/webauthn/android:jni_headers",
|
||||
@@ -1112,7 +1112,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
"android/android_theme_resources.h",
|
||||
"android/autocomplete/tab_matcher_android.cc",
|
||||
"android/autocomplete/tab_matcher_android.h",
|
||||
@@ -3263,6 +3300,7 @@ static_library("browser") {
|
||||
@@ -3257,6 +3294,7 @@ static_library("browser") {
|
||||
"webauthn/android/webauthn_request_delegate_android.cc",
|
||||
"webauthn/android/webauthn_request_delegate_android.h",
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user