Skip to content

Commit 4bf9ceb

Browse files
alancutterChromium LUCI CQ
authored andcommitted
Remove feature flags for default Chat/Meet apps
This feature has shipped in M92 and these flags are no longer needed. Bug: 1203138 Change-Id: I188f1449aad03c4f81efd8b937c58cfb948d3e0c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3149802 Reviewed-by: Eric Willigers <[email protected]> Commit-Queue: Eric Willigers <[email protected]> Auto-Submit: Alan Cutter <[email protected]> Cr-Commit-Position: refs/heads/main@{#920035}
1 parent 880f438 commit 4bf9ceb

File tree

8 files changed

+0
-57
lines changed

8 files changed

+0
-57
lines changed

chrome/browser/about_flags.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3669,12 +3669,6 @@ const FeatureEntry kFeatureEntries[] = {
36693669
kOsCrOS,
36703670
FEATURE_VALUE_TYPE(
36713671
web_app::kAllowDefaultWebAppMigrationForChromeOsManagedUsers)},
3672-
{"enable-default-chat-web-app", flag_descriptions::kDefaultChatWebAppName,
3673-
flag_descriptions::kDefaultChatWebAppDescription, kOsCrOS,
3674-
FEATURE_VALUE_TYPE(web_app::kDefaultChatWebApp)},
3675-
{"enable-default-meet-web-app", flag_descriptions::kDefaultMeetWebAppName,
3676-
flag_descriptions::kDefaultMeetWebAppDescription, kOsCrOS,
3677-
FEATURE_VALUE_TYPE(web_app::kDefaultMeetWebApp)},
36783672
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
36793673
#if BUILDFLAG(IS_CHROMEOS_ASH)
36803674
{"enable-desktop-pwas-attention-badging-cros",

chrome/browser/flag-metadata.json

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,22 +1744,6 @@
17441744
17451745
"expiry_milestone": 99
17461746
},
1747-
{
1748-
"name": "enable-default-chat-web-app",
1749-
"owners": [
1750-
1751-
1752-
],
1753-
"expiry_milestone": 94
1754-
},
1755-
{
1756-
"name": "enable-default-meet-web-app",
1757-
"owners": [
1758-
1759-
1760-
],
1761-
"expiry_milestone": 94
1762-
},
17631747
{
17641748
"name": "enable-defer-all-script",
17651749
"owners": [ "//components/data_reduction_proxy/OWNERS" ],

chrome/browser/flag_descriptions.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5144,14 +5144,6 @@ const char kDefaultCalculatorWebAppName[] = "Default install Calculator PWA";
51445144
const char kDefaultCalculatorWebAppDescription[] =
51455145
"Enable default installing of the calculator PWA instead of the deprecated "
51465146
"chrome app.";
5147-
5148-
const char kDefaultChatWebAppName[] = "Default Chat web app";
5149-
const char kDefaultChatWebAppDescription[] =
5150-
"Enables the Chat web app to be installed by default.";
5151-
5152-
const char kDefaultMeetWebAppName[] = "Default Meet web app";
5153-
const char kDefaultMeetWebAppDescription[] =
5154-
"Enables the Meet web app to be installed by default.";
51555147
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
51565148

51575149
#if defined(OS_CHROMEOS)

chrome/browser/flag_descriptions.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2978,12 +2978,6 @@ extern const char
29782978

29792979
extern const char kDefaultCalculatorWebAppName[];
29802980
extern const char kDefaultCalculatorWebAppDescription[];
2981-
2982-
extern const char kDefaultChatWebAppName[];
2983-
extern const char kDefaultChatWebAppDescription[];
2984-
2985-
extern const char kDefaultMeetWebAppName[];
2986-
extern const char kDefaultMeetWebAppDescription[];
29872981
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
29882982

29892983
#if defined(OS_CHROMEOS)

chrome/browser/web_applications/preinstalled_app_install_features.cc

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ namespace {
1818
constexpr const base::Feature* kPreinstalledAppInstallFeatures[] = {
1919
&kMigrateDefaultChromeAppToWebAppsGSuite,
2020
&kMigrateDefaultChromeAppToWebAppsNonGSuite,
21-
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
22-
&kDefaultChatWebApp,
23-
&kDefaultMeetWebApp,
24-
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
2521
};
2622

2723
bool g_always_enabled_for_testing = false;
@@ -67,13 +63,6 @@ const base::Feature kAllowDefaultWebAppMigrationForChromeOsManagedUsers{
6763
"AllowDefaultWebAppMigrationForChromeOsManagedUsers",
6864
base::FEATURE_DISABLED_BY_DEFAULT};
6965

70-
// Enables default installing the Chat web app.
71-
const base::Feature kDefaultChatWebApp{"DefaultChatWebApp",
72-
base::FEATURE_ENABLED_BY_DEFAULT};
73-
74-
// Enables default installing the Meet web app.
75-
const base::Feature kDefaultMeetWebApp{"DefaultMeetWebApp",
76-
base::FEATURE_ENABLED_BY_DEFAULT};
7766
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
7867

7968
bool IsPreinstalledAppInstallFeatureEnabled(base::StringPiece feature_name,

chrome/browser/web_applications/preinstalled_app_install_features.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ extern const base::Feature kDefaultCalculatorWebApp;
2222

2323
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
2424
extern const base::Feature kAllowDefaultWebAppMigrationForChromeOsManagedUsers;
25-
26-
extern const base::Feature kDefaultChatWebApp;
27-
28-
extern const base::Feature kDefaultMeetWebApp;
2925
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
3026

3127
// Returns the base::Feature in |kPreinstalledAppInstallFeatures| that

chrome/browser/web_applications/preinstalled_web_apps/google_chat.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
#include "chrome/browser/web_applications/preinstalled_web_apps/google_chat.h"
66

7-
#include "chrome/browser/web_applications/preinstalled_app_install_features.h"
8-
97
namespace web_app {
108

119
ExternalInstallOptions GetConfigForGoogleChat() {
@@ -17,7 +15,6 @@ ExternalInstallOptions GetConfigForGoogleChat() {
1715

1816
// Exclude managed users until we have a way for admins to block the app.
1917
options.user_type_allowlist = {"unmanaged"};
20-
options.gate_on_feature = kDefaultChatWebApp.name;
2118
options.only_for_new_users = true;
2219
options.add_to_quick_launch_bar = false;
2320

chrome/browser/web_applications/preinstalled_web_apps/google_meet.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
#include "chrome/browser/web_applications/preinstalled_web_apps/google_meet.h"
66

7-
#include "chrome/browser/web_applications/preinstalled_app_install_features.h"
8-
97
namespace web_app {
108

119
ExternalInstallOptions GetConfigForGoogleMeet() {
@@ -17,7 +15,6 @@ ExternalInstallOptions GetConfigForGoogleMeet() {
1715

1816
// Exclude managed users until we have a way for admins to block the app.
1917
options.user_type_allowlist = {"unmanaged", "child"};
20-
options.gate_on_feature = kDefaultMeetWebApp.name;
2118
options.only_for_new_users = true;
2219
options.add_to_quick_launch_bar = false;
2320

0 commit comments

Comments
 (0)