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

Unified Diff: chrome/browser/chromeos/settings/stub_cros_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/stub_cros_settings_provider.cc
diff --git a/chrome/browser/chromeos/settings/stub_cros_settings_provider.cc b/chrome/browser/chromeos/settings/stub_cros_settings_provider.cc
index d957bdd1c9e38f54fedbfed8cc1d4b1943a153fc..d3cd61b1b896dcfe441a344802793f66c7d6a9e2 100644
--- a/chrome/browser/chromeos/settings/stub_cros_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/stub_cros_settings_provider.cc
@@ -9,38 +9,10 @@
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/cros_settings_names.h"
+#include "chrome/browser/chromeos/settings/device_settings_provider.h"
namespace chromeos {
-namespace {
-
-const char* kHandledSettings[] = {
- kAccountsPrefAllowGuest,
- kAccountsPrefAllowNewUser,
- kAccountsPrefShowUserNamesOnSignIn,
- kAccountsPrefUsers,
- kAccountsPrefEphemeralUsersEnabled,
- kAccountsPrefDeviceLocalAccounts,
- kDeviceOwner,
- kPolicyMissingMitigationMode,
- kReleaseChannel,
- kReportDeviceVersionInfo,
- kReportDeviceActivityTimes,
- kReportDeviceBootMode,
- kReportDeviceLocation,
- kSettingProxyEverywhere,
- kSignedDataRoamingEnabled,
- kStatsReportingPref,
- kSystemTimezonePolicy,
- // Kiosk mode settings.
- kIdleLogoutTimeout,
- kIdleLogoutWarningDuration,
- kScreenSaverExtensionId,
- kScreenSaverTimeout
-};
-
-} // namespace
-
StubCrosSettingsProvider::StubCrosSettingsProvider(
const NotifyObserversCallback& notify_cb)
: CrosSettingsProvider(notify_cb) {
@@ -71,8 +43,9 @@ CrosSettingsProvider::TrustedStatus
}
bool StubCrosSettingsProvider::HandlesSetting(const std::string& path) const {
- const char** end = kHandledSettings + arraysize(kHandledSettings);
- return std::find(kHandledSettings, end, path) != end;
+ static const char** begin = DeviceSettingsProvider::kKnownSettingsBegin;
+ static const char** end = DeviceSettingsProvider::kKnownSettingsEnd;
+ return std::find(begin, end, path) != end;
}
void StubCrosSettingsProvider::DoSet(const std::string& path,

Powered by Google App Engine
This is Rietveld 408576698