#805 changed string to "This setting is enforced by Cromite"
This commit is contained in:
@@ -16,6 +16,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
chrome/browser/signin/chrome_signin_client.cc | 7 +-
|
||||
.../ui/webui/policy/policy_ui_handler.cc | 104 ++++++++++++-
|
||||
.../ui/webui/policy/policy_ui_handler.h | 2 +
|
||||
.../strings/android/browser_ui_strings.grd | 2 +-
|
||||
.../commerce/core/commerce_feature_list.cc | 65 ++------
|
||||
.../core/browser/browser_policy_connector.cc | 3 +
|
||||
.../common/command_line_policy_provider.cc | 3 +
|
||||
@@ -32,7 +33,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
components/signin/features.gni | 2 +-
|
||||
.../gaia_cookie_manager_service.cc | 4 +
|
||||
google_apis/gaia/gaia_auth_fetcher.cc | 1 +
|
||||
28 files changed, 318 insertions(+), 149 deletions(-)
|
||||
29 files changed, 319 insertions(+), 150 deletions(-)
|
||||
|
||||
diff --git a/base/win/win_util.cc b/base/win/win_util.cc
|
||||
--- a/base/win/win_util.cc
|
||||
@@ -472,6 +473,18 @@ diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.h b/chrome/browser
|
||||
void HandleListenPoliciesUpdates(const base::Value::List& args);
|
||||
void HandleReloadPolicies(const base::Value::List& args);
|
||||
void HandleCopyPoliciesJson(const base::Value::List& args);
|
||||
diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
|
||||
--- a/components/browser_ui/strings/android/browser_ui_strings.grd
|
||||
+++ b/components/browser_ui/strings/android/browser_ui_strings.grd
|
||||
@@ -384,7 +384,7 @@
|
||||
|
||||
<!-- Settings UI -->
|
||||
<message name="IDS_MANAGED_BY_YOUR_ORGANIZATION" desc="Popup message when the user clicks a UI element that has been disabled by enterprise policy.">
|
||||
- This setting is enforced by your administrator.
|
||||
+ This setting is enforced by Cromite.
|
||||
</message>
|
||||
<message name="IDS_MANAGED_BY_YOUR_PARENTS" desc="Popup message when the user clicks a UI element that has been disabled by their parents.">
|
||||
Managed by your parents
|
||||
diff --git a/components/commerce/core/commerce_feature_list.cc b/components/commerce/core/commerce_feature_list.cc
|
||||
--- a/components/commerce/core/commerce_feature_list.cc
|
||||
+++ b/components/commerce/core/commerce_feature_list.cc
|
||||
|
||||
Reference in New Issue
Block a user