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

Unified Diff: chrome/browser/chromeos/settings/device_settings_provider.cc

Issue 11975009: Prevent a DCHECK when starting a chromeos=1 build with --stub-cros-settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: share setting names list Created 7 years, 11 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/settings/device_settings_provider.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
index 8f662117e586701cbb76656bfd5eff0a1ed84326..8a1e26055e984a9b83b2e26e1d74f68543893032 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -36,6 +36,9 @@ namespace chromeos {
namespace {
+// Legacy policy file location. Used to detect migration from pre v12 ChromeOS.
+const char kLegacyPolicyFile[] = "/var/lib/whitelist/preferences";
+
// List of settings handled by the DeviceSettingsProvider.
const char* kKnownSettings[] = {
kAccountsPrefAllowGuest,
@@ -64,12 +67,18 @@ const char* kKnownSettings[] = {
kSystemTimezonePolicy,
};
-// Legacy policy file location. Used to detect migration from pre v12 ChromeOS.
-const char kLegacyPolicyFile[] = "/var/lib/whitelist/preferences";
+} // namespace
+
+const char** DeviceSettingsProvider::kKnownSettingsBegin = kKnownSettings;
+const char** DeviceSettingsProvider::kKnownSettingsEnd =
+ kKnownSettings + arraysize(kKnownSettings);
+
+namespace {
bool IsControlledSetting(const std::string& pref_path) {
- const char** end = kKnownSettings + arraysize(kKnownSettings);
- return std::find(kKnownSettings, end, pref_path) != end;
+ static const char** begin = DeviceSettingsProvider::kKnownSettingsBegin;
+ static const char** end = DeviceSettingsProvider::kKnownSettingsEnd;
+ return std::find(begin, end, pref_path) != end;
}
bool HasOldMetricsFile() {

Powered by Google App Engine
This is Rietveld 408576698