Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(680)

Unified Diff: chrome/browser/chromeos/arc/arc_support_host.cc

Issue 2225933002: Suppress ToS and reflect admin policy in ARC++ welcome screen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add OS_CHROMEOS checks Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/arc/arc_support_host.cc
diff --git a/chrome/browser/chromeos/arc/arc_support_host.cc b/chrome/browser/chromeos/arc/arc_support_host.cc
index b6b434eebfa63e4719f866a5826a03024d76f8b0..5684ca325b3526896821f19331f801af4f8efcfb 100644
--- a/chrome/browser/chromeos/arc/arc_support_host.cc
+++ b/chrome/browser/chromeos/arc/arc_support_host.cc
@@ -31,7 +31,10 @@
namespace {
const char kAction[] = "action";
const char kBackupRestoreEnabled[] = "backupRestoreEnabled";
+const char kBackupRestoreManaged[] = "backupRestoreManaged";
const char kLocationServiceEnabled[] = "locationServiceEnabled";
+const char kLocationServiceManaged[] = "locationServiceManaged";
+const char kProfileManaged[] = "profileManaged";
const char kCanEnable[] = "canEnable";
const char kCode[] = "code";
const char kData[] = "data";
@@ -162,6 +165,9 @@ bool ArcSupportHost::Initialize() {
loadtime_data->SetString(
"serverError",
l10n_util::GetStringUTF16(IDS_ARC_SERVER_COMMUNICATION_ERROR));
+ loadtime_data->SetString(
+ "managementText",
+ l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));
const std::string& app_locale = g_browser_process->GetApplicationLocale();
const std::string& country_code = base::CountryCodeForCurrentTimezone();
@@ -170,9 +176,20 @@ bool ArcSupportHost::Initialize() {
loadtime_data->SetBoolean(kBackupRestoreEnabled,
arc_auth_service->profile()->GetPrefs()->GetBoolean(
prefs::kArcBackupRestoreEnabled));
+ loadtime_data->SetBoolean(kBackupRestoreManaged,
+ arc_auth_service->profile()->GetPrefs()
+ ->IsManagedPreference(
+ prefs::kArcBackupRestoreEnabled));
loadtime_data->SetBoolean(kLocationServiceEnabled,
arc_auth_service->profile()->GetPrefs()->GetBoolean(
prefs::kArcLocationServiceEnabled));
+ loadtime_data->SetBoolean(kLocationServiceManaged,
+ arc_auth_service->profile()->GetPrefs()
+ ->IsManagedPreference(
+ prefs::kArcLocationServiceEnabled));
+ loadtime_data->SetBoolean(kProfileManaged,
+ arc::ArcAuthService::IsAccountManaged(
+ arc_auth_service->profile()));
webui::SetLoadTimeDataDefaults(app_locale, loadtime_data.get());
DCHECK(arc_auth_service);
« no previous file with comments | « chrome/browser/chromeos/arc/arc_auth_service.cc ('k') | chrome/browser/policy/configuration_policy_handler_list_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698