Commit ef022e96 authored by Owen Min's avatar Owen Min Committed by Commit Bot

Register pref for extension request policy

The pref is registered with profile prefs.

Also change the enterprise_reporting::RegisterPrefs to
enterprise_reporting::RegisterLocalStatePrefs.

Bug: 1006899
Change-Id: I8334229e585f088f0a5da8bd8d0545c5c9078ed2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1854467Reviewed-by: default avatarJulian Pastarmov <pastarmovj@chromium.org>
Reviewed-by: default avatarGabriel Charette <gab@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706166}
parent 7a8664bd
...@@ -7,17 +7,22 @@ ...@@ -7,17 +7,22 @@
#include "base/feature_list.h" #include "base/feature_list.h"
#include "chrome/common/chrome_features.h" #include "chrome/common/chrome_features.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
namespace enterprise_reporting { namespace enterprise_reporting {
const char kLastUploadTimestamp[] = const char kLastUploadTimestamp[] =
"enterprise_reporting.last_upload_timestamp"; "enterprise_reporting.last_upload_timestamp";
void RegisterPrefs(PrefRegistrySimple* registry) { void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
// This is also registered as a Profile pref which will be removed after // This is also registered as a Profile pref which will be removed after
// the migration. // the migration.
registry->RegisterBooleanPref(prefs::kCloudReportingEnabled, false); registry->RegisterBooleanPref(prefs::kCloudReportingEnabled, false);
registry->RegisterTimePref(kLastUploadTimestamp, base::Time()); registry->RegisterTimePref(kLastUploadTimestamp, base::Time());
} }
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kCloudExtensionRequestEnabled, false);
}
} // namespace enterprise_reporting } // namespace enterprise_reporting
...@@ -7,11 +7,16 @@ ...@@ -7,11 +7,16 @@
#include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_registry_simple.h"
namespace user_prefs {
class PrefRegistrySyncable;
}
namespace enterprise_reporting { namespace enterprise_reporting {
extern const char kLastUploadTimestamp[]; extern const char kLastUploadTimestamp[];
void RegisterPrefs(PrefRegistrySimple* registry); void RegisterLocalStatePrefs(PrefRegistrySimple* registry);
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
} // namespace enterprise_reporting } // namespace enterprise_reporting
......
...@@ -930,6 +930,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { ...@@ -930,6 +930,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
base::Value::Type::BOOLEAN }, base::Value::Type::BOOLEAN },
#endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
#if !defined(OS_ANDROID)
{ key::kCloudExtensionRequestEnabled,
prefs::kCloudExtensionRequestEnabled,
base::Value::Type::BOOLEAN
},
#endif
#if defined(OS_WIN) #if defined(OS_WIN)
{ key::kChromeCleanupEnabled, { key::kChromeCleanupEnabled,
prefs::kSwReporterEnabled, prefs::kSwReporterEnabled,
......
...@@ -647,7 +647,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { ...@@ -647,7 +647,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
StartupBrowserCreator::RegisterLocalStatePrefs(registry); StartupBrowserCreator::RegisterLocalStatePrefs(registry);
task_manager::TaskManagerInterface::RegisterPrefs(registry); task_manager::TaskManagerInterface::RegisterPrefs(registry);
UpgradeDetector::RegisterPrefs(registry); UpgradeDetector::RegisterPrefs(registry);
enterprise_reporting::RegisterPrefs(registry); enterprise_reporting::RegisterLocalStatePrefs(registry);
#if !defined(OS_CHROMEOS) #if !defined(OS_CHROMEOS)
RegisterDefaultBrowserPromptPrefs(registry); RegisterDefaultBrowserPromptPrefs(registry);
#endif // !defined(OS_CHROMEOS) #endif // !defined(OS_CHROMEOS)
...@@ -999,6 +999,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, ...@@ -999,6 +999,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
extensions::enterprise_reporting::RegisterProfilePrefs(registry); extensions::enterprise_reporting::RegisterProfilePrefs(registry);
#endif #endif
#if !defined(OS_ANDROID)
enterprise_reporting::RegisterProfilePrefs(registry);
#endif
RegisterProfilePrefsForMigration(registry); RegisterProfilePrefsForMigration(registry);
} }
......
...@@ -2467,6 +2467,10 @@ const char kRegisteredSupervisedUserWhitelists[] = ...@@ -2467,6 +2467,10 @@ const char kRegisteredSupervisedUserWhitelists[] =
// or not. // or not.
const char kCloudReportingEnabled[] = const char kCloudReportingEnabled[] =
"enterprise_reporting.chrome_cloud_reporting"; "enterprise_reporting.chrome_cloud_reporting";
// Boolean that indicates whether Chrome enterprise extension request is enabled
// or not.
const char kCloudExtensionRequestEnabled[] =
"enterprise_reporting.extension_request.enabled";
#endif #endif
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
......
...@@ -844,6 +844,7 @@ extern const char kRegisteredSupervisedUserWhitelists[]; ...@@ -844,6 +844,7 @@ extern const char kRegisteredSupervisedUserWhitelists[];
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
extern const char kCloudReportingEnabled[]; extern const char kCloudReportingEnabled[];
extern const char kCloudExtensionRequestEnabled[];
#endif #endif
#if BUILDFLAG(ENABLE_BACKGROUND_MODE) #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
......
...@@ -5036,7 +5036,13 @@ ...@@ -5036,7 +5036,13 @@
] ]
}, },
"CloudExtensionRequestEnabled": {}, "CloudExtensionRequestEnabled": {
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "CloudExtensionRequestEnabled": false },
"pref_mappings": [
{ "pref": "enterprise_reporting.extension_request.enabled"}
]
},
"CloudReportingEnabled": { "CloudReportingEnabled": {
"os": ["win", "linux", "mac"], "os": ["win", "linux", "mac"],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment