Privacy Guide Android: Moved to a separate flag
Bug: 1215630
Change-Id: I7fce87b979fafe2fc1ccc792f86bdbcdd5cc7229
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3654193
Commit-Queue: Andrey Zaytsev <[email protected]>
Reviewed-by: Rainhard Findling <[email protected]>
Auto-Submit: Andrey Zaytsev <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1006414}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 0f98bd2..d018804 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -7909,7 +7909,7 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
{"privacy-guide", flag_descriptions::kPrivacyGuideName,
- flag_descriptions::kPrivacyGuideDescription, kOsDesktop | kOsAndroid,
+ flag_descriptions::kPrivacyGuideDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kPrivacyGuide)},
{"privacy-guide-2", flag_descriptions::kPrivacyGuide2Name,
@@ -7917,6 +7917,12 @@
FEATURE_VALUE_TYPE(features::kPrivacyGuide2)},
#if BUILDFLAG(IS_ANDROID)
+ {"privacy-guide-android", flag_descriptions::kPrivacyGuideAndroidName,
+ flag_descriptions::kPrivacyGuideAndroidDescription, kOsAndroid,
+ FEATURE_VALUE_TYPE(features::kPrivacyGuideAndroid)},
+#endif
+
+#if BUILDFLAG(IS_ANDROID)
{"google-mobile-services-passwords",
flag_descriptions::kUnifiedPasswordManagerAndroidName,
flag_descriptions::kUnifiedPasswordManagerAndroidDescription, kOsAndroid,
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index ce71c93..2f7a5f3 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -4955,6 +4955,14 @@
"expiry_milestone": 104
},
{
+ "name": "privacy-guide-android",
+ "owners": [
+ "andzaytsev",
+ "msramek",
+ "[email protected]"],
+ "expiry_milestone": 114
+ },
+ {
"name": "privacy-sandbox-ads-apis",
"owners": [
"johnidel",
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 8efc383c3..9d33b1c 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2167,6 +2167,11 @@
"Enables UI updates for Privacy Guide. This requires #privacy-guide to "
"also be enabled";
+const char kPrivacyGuideAndroidName[] = "Privacy Guide on Android";
+const char kPrivacyGuideAndroidDescription[] =
+ "Shows a new subpage in Settings that helps the user to review various "
+ "privacy settings.";
+
const char kPrivacySandboxAdsAPIsOverrideName[] = "Privacy Sandbox Ads APIs";
const char kPrivacySandboxAdsAPIsOverrideDescription[] =
"Enables Privacy Sandbox APIs: Attribution Reporting, Fledge, Topics, "
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 9fedd71..f762bb1f 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1212,6 +1212,9 @@
extern const char kPrivacyGuide2Name[];
extern const char kPrivacyGuide2Description[];
+extern const char kPrivacyGuideAndroidName[];
+extern const char kPrivacyGuideAndroidDescription[];
+
extern const char kPrivacySandboxAdsAPIsOverrideName[];
extern const char kPrivacySandboxAdsAPIsOverrideDescription[];
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
index 5280289..38e2d56 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -118,7 +118,7 @@
&features::kElasticOverscroll,
&features::kElidePrioritizationOfPreNativeBootstrapTasks,
&features::kGiveJavaUiThreadDefaultTaskTraitsUserBlockingPriority,
- &features::kPrivacyGuide,
+ &features::kPrivacyGuideAndroid,
&features::kPushMessagingDisallowSenderIDs,
&features::kPwaUpdateDialogForIcon,
&features::kPwaUpdateDialogForName,
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
index ab455bf..a6181887 100644
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -454,7 +454,7 @@
public static final String PREFETCH_NOTIFICATION_SCHEDULING_INTEGRATION =
"PrefetchNotificationSchedulingIntegration";
public static final String PRERENDER2 = "Prerender2";
- public static final String PRIVACY_REVIEW = "PrivacyGuide";
+ public static final String PRIVACY_REVIEW = "PrivacyGuideAndroid";
public static final String PRIVACY_SANDBOX_SETTINGS_3 = "PrivacySandboxSettings3";
public static final String PROBABILISTIC_CRYPTID_RENDERER = "ProbabilisticCryptidRenderer";
public static final String PUSH_MESSAGING_DISALLOW_SENDER_IDS =
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
index 202a0e5c5..14a132b 100644
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -808,6 +808,9 @@
const base::Feature kPrivacyGuide2{"PrivacyGuide2",
base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kPrivacyGuideAndroid{"PrivacyGuideAndroid",
+ base::FEATURE_DISABLED_BY_DEFAULT};
+
// Enables or disables push subscriptions keeping Chrome running in the
// background when closed.
const base::Feature kPushMessagingBackgroundMode{
diff --git a/chrome/common/chrome_features.h b/chrome/common/chrome_features.h
index 54d3797f..ebfe779 100644
--- a/chrome/common/chrome_features.h
+++ b/chrome/common/chrome_features.h
@@ -568,6 +568,9 @@
extern const base::Feature kPrivacyGuide2;
COMPONENT_EXPORT(CHROME_FEATURES)
+extern const base::Feature kPrivacyGuideAndroid;
+
+COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kPushMessagingBackgroundMode;
COMPONENT_EXPORT(CHROME_FEATURES)
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index 4a4b56a..b458ccf 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -56968,6 +56968,7 @@
<int value="-523030434" label="EnableBackgroundBlur:enabled"/>
<int value="-522075903"
label="OmniboxOnFocusSuggestionsContextualWeb:enabled"/>
+ <int value="-521251533" label="PrivacyGuideAndroid:enabled"/>
<int value="-520221221" label="UserDataSnapshot:enabled"/>
<int value="-520004021" label="WebXRHitTest:disabled"/>
<int value="-519960638" label="enable-site-engagement-service"/>
@@ -58750,6 +58751,7 @@
<int value="682916740" label="PdfUnseasoned:disabled"/>
<int value="683013217" label="AllowPopupsDuringPageUnload:disabled"/>
<int value="683433500" label="CommerceMerchantViewer:disabled"/>
+ <int value="683746280" label="PrivacyGuideAndroid:disabled"/>
<int value="684198422" label="UnifiedPasswordManagerDesktop:enabled"/>
<int value="684806628" label="TranslateLanguageByULP:disabled"/>
<int value="685406951" label="UseNotificationCompatBuilder:disabled"/>
