[CrOS Messages] Add flag for web push in ChromeOS - Messages itegration

This flag controls FCM web push based background notifications for Android Messages integration on ChromeOS. See go/awm-cros-fcm. Bug: 920831 Change-Id: I89fc2642e60697d265fbcf0c50ea4afd6ba0de8b Reviewed-on: https://chromium-review.googlesource.com/c/1419223 Reviewed-by: Kyle Horimoto <khorimoto@chromium.org> Reviewed-by: Jeremy Klein <jlklein@chromium.org> Reviewed-by: Avi Drissman <avi@chromium.org> Commit-Queue: Azeem Arshad <azeemarshad@chromium.org> Cr-Commit-Position: refs/heads/master@{#625037}
Denger-Network · Jan 23, 2019 · 373e1ea · 373e1ea
1 parent 69ac138
commit 373e1ea
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 0 deletions.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -1560,6 +1560,9 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kUseMessagesGoogleComDomainName,
      flag_descriptions::kUseMessagesGoogleComDomainDescription, kOsCrOS,
      FEATURE_VALUE_TYPE(chromeos::features::kUseMessagesGoogleComDomain)},
+    {"enable_messages_web_push", flag_descriptions::kEnableMessagesWebPushName,
+     flag_descriptions::kEnableMessagesWebPushDescription, kOsCrOS,
+     FEATURE_VALUE_TYPE(chromeos::features::kEnableMessagesWebPush)},
     {
         "enable-background-blur",
         flag_descriptions::kEnableBackgroundBlurName,

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
@@ -2223,6 +2223,11 @@
     "owners": [ "azeemarshad", "khorimoto" ],
     "expiry_milestone": 76
   },
+  {
+    "name": "enable_messages_web_push",
+    "owners": [ "azeemarshad", "jlklein", "khorimoto" ],
+    "expiry_milestone": 76
+  },
   {
     "name": "enforce-tls13-downgrade",
     "owners": [ "davidben", "svaldez" ],

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
@@ -58,6 +58,12 @@ const char kUseMessagesGoogleComDomainDescription[] =
     "Use the messages.google.com domain as part of the \"Messages\" "
     "feature under \"Connected Devices\" settings.";
 
+const char kEnableMessagesWebPushName[] =
+    "Web push in Android Messages integration";
+const char kEnableMessagesWebPushDescription[] =
+    "Use web push for background notificatons in Chrome OS integration "
+    "with Android Messages for Web";
+
 const char kAndroidSiteSettingsUIRefreshName[] =
     "Android Site Settings UI changes.";
 const char kAndroidSiteSettingsUIRefreshDescription[] =

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
@@ -67,6 +67,9 @@ extern const char kAndroidMessagesIntegrationDescription[];
 extern const char kUseMessagesGoogleComDomainName[];
 extern const char kUseMessagesGoogleComDomainDescription[];
 
+extern const char kEnableMessagesWebPushName[];
+extern const char kEnableMessagesWebPushDescription[];
+
 extern const char kAndroidSiteSettingsUIRefreshName[];
 extern const char kAndroidSiteSettingsUIRefreshDescription[];
 

diff --git a/chromeos/constants/chromeos_features.cc b/chromeos/constants/chromeos_features.cc
@@ -41,6 +41,11 @@ const base::Feature kDiscoverApp{"DiscoverApp",
 // If enabled, DriveFS will be used for Drive sync.
 const base::Feature kDriveFs{"DriveFS", base::FEATURE_ENABLED_BY_DEFAULT};
 
+// Enables or disables web push for background notifications in
+// Android Messages Integration on Chrome OS.
+const base::Feature kEnableMessagesWebPush{"EnableMessagesWebPush",
+                                           base::FEATURE_DISABLED_BY_DEFAULT};
+
 // If enabled, MyFiles will be a root/volume and user can create other
 // sub-folders and files in addition to the Downloads folder inside MyFiles.
 const base::Feature kMyFilesVolume{"MyFilesVolume",

diff --git a/chromeos/constants/chromeos_features.h b/chromeos/constants/chromeos_features.h
@@ -23,6 +23,7 @@ CHROMEOS_EXPORT extern const base::Feature kCrostiniUsbSupport;
 CHROMEOS_EXPORT extern const base::Feature kCryptAuthV2Enrollment;
 CHROMEOS_EXPORT extern const base::Feature kDiscoverApp;
 CHROMEOS_EXPORT extern const base::Feature kDriveFs;
+CHROMEOS_EXPORT extern const base::Feature kEnableMessagesWebPush;
 CHROMEOS_EXPORT extern const base::Feature kMyFilesVolume;
 CHROMEOS_EXPORT extern const base::Feature kEnableSupervisionTransitionScreens;
 CHROMEOS_EXPORT extern const base::Feature kFsNosymfollow;

diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
@@ -32399,6 +32399,7 @@ from previous Chrome versions.
   <int value="1376437124" label="show-cert-link"/>
   <int value="1377056573" label="browser-side-navigation:enabled"/>
   <int value="1378310092" label="disable-suggestions-service"/>
+  <int value="1379944457" label="EnableMessagesWebPush:disabled"/>
   <int value="1381746642" label="enable-automatic-password-saving"/>
   <int value="1382107019" label="LevelDBPerformRewrite:disabled"/>
   <int value="1382500494" label="disable-drive-apps-in-app-list"/>
@@ -32801,6 +32802,7 @@ from previous Chrome versions.
   <int value="2075207488" label="AutomaticPasswordGeneration:disabled"/>
   <int value="2076787478" label="OmniboxDisplayTitleForCurrentUrl:disabled"/>
   <int value="2076903744" label="progress-bar-animation"/>
+  <int value="2077106718" label="EnableMessagesWebPush:enabled"/>
   <int value="2077917024"
       label="enable-supervised-user-managed-bookmarks-folder"/>
   <int value="2079672348" label="ExperimentalKeyboardLockUI:disabled"/>