Rename chrome://flags/enterprise to chrome://flags/deprecated
Bug: 982371
Change-Id: I6b6aaf1615cad18927df9523f12dac779b2375c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1779105
Reviewed-by: Nico Weber <[email protected]>
Reviewed-by: Hector Carmona <[email protected]>
Reviewed-by: Elly Fong-Jones <[email protected]>
Commit-Queue: Yann Dago <[email protected]>
Cr-Commit-Position: refs/heads/master@{#693179}
diff --git a/components/components_chromium_strings.grd b/components/components_chromium_strings.grd
index a8682046..17658371 100644
--- a/components/components_chromium_strings.grd
+++ b/components/components_chromium_strings.grd
@@ -198,14 +198,14 @@
</message>
</if>
- <!-- about:flags/enterprise strings -->
+ <!-- about:flags/deprecated strings -->
<if expr="not chromeos">
- <message name="IDS_ENTERPRISE_SETTINGS_RELAUNCH_NOTICE" desc="Notifies the user that they need to relaunch Chromium. Shown next to a button that says 'Relaunch Now'.">
+ <message name="IDS_DEPRECATED_FEATURES_RELAUNCH_NOTICE" desc="Notifies the user that they need to relaunch Chromium. Shown next to a button that says 'Relaunch Now'.">
Your changes will take effect the next time you relaunch Chromium.
</message>
</if>
<if expr="chromeos">
- <message name="IDS_ENTERPRISE_SETTINGS_RELAUNCH_NOTICE" desc="Notifies the user that they need to restart Chromium OS. Shown next to a button that says 'Restart Now'.">
+ <message name="IDS_DEPRECATED_FEATURES_RELAUNCH_NOTICE" desc="Notifies the user that they need to restart Chromium OS. Shown next to a button that says 'Restart Now'.">
Your changes will take effect the next time you restart your device.
</message>
</if>
diff --git a/components/components_google_chrome_strings.grd b/components/components_google_chrome_strings.grd
index dbfc88e1..a590332 100644
--- a/components/components_google_chrome_strings.grd
+++ b/components/components_google_chrome_strings.grd
@@ -198,14 +198,14 @@
</message>
</if>
- <!-- about:flags/enterprise strings -->
+ <!-- about:flags/deprecated strings -->
<if expr="not chromeos">
- <message name="IDS_ENTERPRISE_SETTINGS_RELAUNCH_NOTICE" desc="Notifies the user that they need to relaunch Chrome. Shown next to a button that says 'Relaunch Now'.">
+ <message name="IDS_DEPRECATED_FEATURES_RELAUNCH_NOTICE" desc="Notifies the user that they need to relaunch Chrome. Shown next to a button that says 'Relaunch Now'.">
Your changes will take effect the next time you relaunch Google Chrome.
</message>
</if>
<if expr="chromeos">
- <message name="IDS_ENTERPRISE_SETTINGS_RELAUNCH_NOTICE" desc="Notifies the user that they need to restart Chrome OS. Shown next to a button that says 'Restart Now'.">
+ <message name="IDS_DEPRECATED_FEATURES_RELAUNCH_NOTICE" desc="Notifies the user that they need to restart Chrome OS. Shown next to a button that says 'Restart Now'.">
Your changes will take effect the next time you restart your device.
</message>
</if>
diff --git a/components/flags_strings.grdp b/components/flags_strings.grdp
index e8e4c3b..d79dbc0 100644
--- a/components/flags_strings.grdp
+++ b/components/flags_strings.grdp
@@ -60,62 +60,62 @@
<message name="IDS_FLAGS_UI_EXPERIMENT_ENABLED" translateable="false" desc="Screen reader text stating that an experiment is enabled.">
Experiment enabled
</message>
- <!-- about:flags/enterprise
+ <!-- about:flags/deprecated
New entries here should also be added for about:flags above -->
- <message name="IDS_ENTERPRISE_SETTINGS_PAGE_RESET" desc="Label for button that resets the features to their default value.">
+ <message name="IDS_DEPRECATED_FEATURES_PAGE_RESET" desc="Label for button that resets the features to their default value.">
Reset all to default
</message>
- <message name="IDS_ENTERPRISE_SETTINGS_OWNER_WARNING" desc="A warning stating what system-wide features can only be set by the owner.">
+ <message name="IDS_DEPRECATED_FEATURES_OWNER_WARNING" desc="A warning stating what system-wide features can only be set by the owner.">
Features that apply system-wide can only be set by the owner: <ph name="OWNER_EMAIL">$1<ex>[email protected]</ex></ph>
</message>
- <message name="IDS_ENTERPRISE_SETTINGS_AVAILABLE_FEATURE" desc="Label for button that shows available features.">
+ <message name="IDS_DEPRECATED_FEATURES_AVAILABLE_FEATURE" desc="Label for button that shows available features.">
Available
</message>
- <message name="IDS_ENTERPRISE_SETTINGS_UNAVAILABLE_FEATURE" desc="Label for button that shows unavailable features.">
+ <message name="IDS_DEPRECATED_FEATURES_UNAVAILABLE_FEATURE" desc="Label for button that shows unavailable features.">
Unavailable
</message>
- <message name="IDS_ENTERPRISE_SETTINGS_ENABLED_FEATURE" desc="This is the 'Enabled' option, not the label for the menu.">
+ <message name="IDS_DEPRECATED_FEATURES_ENABLED_FEATURE" desc="This is the 'Enabled' option, not the label for the menu.">
Enabled
</message>
- <message name="IDS_ENTERPRISE_SETTINGS_DISABLED_FEATURE" desc="This is the 'Disabled' option, not the label for the menu">
+ <message name="IDS_DEPRECATED_FEATURES_DISABLED_FEATURE" desc="This is the 'Disabled' option, not the label for the menu">
Disabled
</message>
- <message name="IDS_ENTERPRISE_SETTINGS_NOT_AVAILABLE_ON_PLATFORM" desc="Message stating that an experiment is not available for the current platform.">
+ <message name="IDS_DEPRECATED_FEATURES_NOT_AVAILABLE_ON_PLATFORM" desc="Message stating that an experiment is not available for the current platform.">
Not available on your platform.
</message>
<if expr="chromeos">
- <message name="IDS_ENTERPRISE_SETTINGS_RELAUNCH" desc="Label for button that restarts chrome os.">
+ <message name="IDS_DEPRECATED_FEATURES_RELAUNCH" desc="Label for button that restarts chrome os.">
Restart
</message>
</if>
<if expr="not chromeos">
- <message name="IDS_ENTERPRISE_SETTINGS_RELAUNCH" desc="Label for button that relaunches chrome.">
+ <message name="IDS_DEPRECATED_FEATURES_RELAUNCH" desc="Label for button that relaunches chrome.">
Relaunch
</message>
</if>
- <message name="IDS_ENTERPRISE_SETTINGS_SEARCH_PLACEHOLDER" desc="The placeholder for the search box on the about:enterprise-settings page.">
+ <message name="IDS_DEPRECATED_FEATURES_SEARCH_PLACEHOLDER" desc="The placeholder for the search box on the about:enterprise-settings page.">
Search features
</message>
- <message name="IDS_ENTERPRISE_SETTINGS_TITLE" desc="The page title for the about:enterprise-settings page.">
+ <message name="IDS_DEPRECATED_FEATURES_TITLE" desc="The page title for the about:enterprise-settings page.">
Deprecated Features
</message>
- <message name="IDS_ENTERPRISE_SETTINGS_PAGE_WARNING" desc="A warning stating that the features of the page are experimental.">
+ <message name="IDS_DEPRECATED_FEATURES_PAGE_WARNING" desc="A warning stating that the features of the page are experimental.">
Warning: Deprecated features ahead!
</message>
- <message name="IDS_ENTERPRISE_SETTINGS_PAGE_WARNING_EXPLANATION" desc="Warning to users that features are deprecated. Shown prominently at the top of the page.">
+ <message name="IDS_DEPRECATED_FEATURES_PAGE_WARNING_EXPLANATION" desc="Warning to users that features are deprecated. Shown prominently at the top of the page.">
By enabling these features, you will be using deprecated features
that will disappear in future versions.
</message>
- <message name="IDS_ENTERPRISE_SETTINGS_NO_RESULTS" desc="Message shown when searching and no results were found.">
+ <message name="IDS_DEPRECATED_FEATURES_NO_RESULTS" desc="Message shown when searching and no results were found.">
No matching features
</message>
- <message name="IDS_ENTERPRISE_UI_CLEAR_SEARCH" desc="Tooltip for icon button that clears the searchbar on the chrome://flags/enterprise page.">
+ <message name="IDS_DEPRECATED_UI_CLEAR_SEARCH" desc="Tooltip for icon button that clears the searchbar on the chrome://flags/enterprise page.">
Clear search
</message>
- <message name="IDS_ENTERPRISE_UI_RESET_ACKNOWLEDGED" desc="Screen reader text stating that the reset action was acknowledged.">
+ <message name="IDS_DEPRECATED_UI_RESET_ACKNOWLEDGED" desc="Screen reader text stating that the reset action was acknowledged.">
Reset acknowledged.
</message>
- <message name="IDS_ENTERPRISE_UI_EXPERIMENT_ENABLED" desc="Screen reader text stating that an experiment is enabled.">
+ <message name="IDS_DEPRECATED_UI_EXPERIMENT_ENABLED" desc="Screen reader text stating that an experiment is enabled.">
Experiment enabled
</message>
</grit-part>
diff --git a/components/flags_ui/flags_state.h b/components/flags_ui/flags_state.h
index 068c53d7..1a8db5f 100644
--- a/components/flags_ui/flags_state.h
+++ b/components/flags_ui/flags_state.h
@@ -43,7 +43,7 @@
kOsAndroid = 1 << 4,
kOsCrOSOwnerOnly = 1 << 5,
kOsIos = 1 << 6,
- kEnterprise = 1 << 7,
+ kDeprecated = 1 << 7,
};
// A flag controlling the behavior of the |ConvertFlagsToSwitches| function -
diff --git a/components/flags_ui/flags_ui_constants.cc b/components/flags_ui/flags_ui_constants.cc
index 04e887d..f0ca132 100644
--- a/components/flags_ui/flags_ui_constants.cc
+++ b/components/flags_ui/flags_ui_constants.cc
@@ -7,7 +7,7 @@
namespace flags_ui {
// Resource paths.
-const char kEnterpriseFlagsCSS[] = "enterprise_flags.css";
+const char kFlagsDeprecatedCSS[] = "flags_deprecated.css";
const char kFlagsJS[] = "flags.js";
const char kFlagsCSS[] = "flags.css";
const char kFlagsStyleLoaderJS[] = "flags_style_loader.js";
diff --git a/components/flags_ui/flags_ui_constants.h b/components/flags_ui/flags_ui_constants.h
index 18911b6..dc95c4d 100644
--- a/components/flags_ui/flags_ui_constants.h
+++ b/components/flags_ui/flags_ui_constants.h
@@ -9,7 +9,7 @@
// Resource paths.
// Must match the resource file names.
-extern const char kEnterpriseFlagsCSS[];
+extern const char kFlagsDeprecatedCSS[];
extern const char kFlagsJS[];
extern const char kFlagsCSS[];
extern const char kFlagsStyleLoaderJS[];
diff --git a/components/flags_ui/resources/flags.css b/components/flags_ui/resources/flags.css
index 44187c4..62862fb 100644
--- a/components/flags_ui/resources/flags.css
+++ b/components/flags_ui/resources/flags.css
@@ -130,7 +130,7 @@
padding: 0;
}
-#enterprise-flags-title {
+#deprecated-flags-title {
display: none;
}
diff --git a/components/flags_ui/resources/flags.html b/components/flags_ui/resources/flags.html
index 356cf3e..b25a4db8 100644
--- a/components/flags_ui/resources/flags.html
+++ b/components/flags_ui/resources/flags.html
@@ -27,7 +27,7 @@
<body>
<div id="header">
<div class="flex-container">
- <div id="enterprise-flags-title" class="flex">
+ <div id="deprecatedd-flags-title" class="flex">
<h1>$i18n{title}</h1>
</div>
<div class="flex center-content">
diff --git a/components/flags_ui/resources/enterprise_flags.css b/components/flags_ui/resources/flags_deprecated.css
similarity index 100%
rename from components/flags_ui/resources/enterprise_flags.css
rename to components/flags_ui/resources/flags_deprecated.css
diff --git a/components/flags_ui/resources/flags_style_loader.js b/components/flags_ui/resources/flags_style_loader.js
index 15581d1..80b31b5 100644
--- a/components/flags_ui/resources/flags_style_loader.js
+++ b/components/flags_ui/resources/flags_style_loader.js
@@ -2,9 +2,9 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. */
-if (window.location.href.startsWith("chrome://flags/enterprise")) {
+if (window.location.href.startsWith("chrome://flags/deprecated")) {
const styles = document.createElement('link');
styles.rel = 'stylesheet';
- styles.href = 'chrome://flags/enterprise_flags.css';
+ styles.href = 'chrome://flags/flags_deprecated.css';
document.querySelector('head').appendChild(styles);
}
diff --git a/components/resources/flags_ui_resources.grdp b/components/resources/flags_ui_resources.grdp
index 0924c4a..016aa26 100644
--- a/components/resources/flags_ui_resources.grdp
+++ b/components/resources/flags_ui_resources.grdp
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<grit-part>
<include name="IDR_FLAGS_UI_FLAGS_CSS" file="../flags_ui/resources/flags.css" flattenhtml="true" type="BINDATA" compress="gzip" />
- <include name="IDR_FLAGS_UI_FLAGS_ENTERPRISE_CSS" file="../flags_ui/resources/enterprise_flags.css" type="BINDATA" compress="gzip" />
+ <include name="IDR_FLAGS_UI_FLAGS_DEPRECATED_CSS" file="../flags_ui/resources/flags_deprecated.css" type="BINDATA" compress="gzip" />
<include name="IDR_FLAGS_UI_FLAGS_HTML" file="../flags_ui/resources/flags.html" preprocess="true" type="BINDATA" compress="gzip" />
<include name="IDR_FLAGS_UI_FLAGS_JS" file="../flags_ui/resources/flags.js" type="BINDATA" compress="gzip" />
<include name="IDR_FLAGS_UI_FLAGS_STYLE_LOADER_JS" file="../flags_ui/resources/flags_style_loader.js" type="BINDATA" compress="gzip" />
