Index: chrome/browser/chromeos/user_cros_settings_provider.h |
diff --git a/chrome/browser/chromeos/user_cros_settings_provider.h b/chrome/browser/chromeos/user_cros_settings_provider.h |
index 0aa70a99a10dbcd90f9565cdca1d21219829273c..6c55e21b0f887a05a1206f61d925079982efc67f 100644 |
--- a/chrome/browser/chromeos/user_cros_settings_provider.h |
+++ b/chrome/browser/chromeos/user_cros_settings_provider.h |
@@ -9,6 +9,7 @@ |
#include <string> |
#include "base/basictypes.h" |
+#include "base/callback.h" |
#include "chrome/browser/chromeos/cros_settings_provider.h" |
#include "chrome/browser/chromeos/login/signed_settings_helper.h" |
@@ -32,42 +33,17 @@ class UserCrosSettingsProvider : public CrosSettingsProvider { |
// Registers cached users settings in preferences. |
static void RegisterPrefs(PrefService* local_state); |
- // Methods to use when trusted (signature verified) values are required. |
- // Return true if subsequent call to corresponding cached_* getter shall |
- // return trusted value. |
- // Return false if trusted values are unavailable at a moment. |
- // In latter case passed task will be posted when ready. |
- bool RequestTrustedAllowGuest(Task* callback); |
- bool RequestTrustedAllowNewUser(Task* callback); |
- bool RequestTrustedDataRoamingEnabled(Task* callback); |
- bool RequestTrustedShowUsersOnSignin(Task* callback); |
- bool RequestTrustedOwner(Task* callback); |
- bool RequestTrustedReportingEnabled(Task* callback); |
- |
// Reloads values from device settings. |
void Reload(); |
- // Helper functions to access cached settings. |
- static bool cached_allow_guest(); |
- static bool cached_allow_new_user(); |
- static bool cached_data_roaming_enabled(); |
- static bool cached_show_users_on_signin(); |
- static bool cached_reporting_enabled(); |
- static const base::ListValue* cached_whitelist(); |
- static std::string cached_owner(); |
- |
- // Returns true if given email is in user whitelist. |
- // Note this function is for display purpose only and should use |
- // CheckWhitelist op for the real whitelist check. |
- static bool IsEmailInCachedWhitelist(const std::string& email); |
- |
// CrosSettingsProvider implementation. |
- virtual bool Get(const std::string& path, |
- base::Value** out_value) const OVERRIDE; |
+ virtual const base::Value* Get(const std::string& path) const OVERRIDE; |
+ virtual bool GetTrusted(const std::string& path, |
+ const base::Closure& callback) const OVERRIDE; |
virtual bool HandlesSetting(const std::string& path) const OVERRIDE; |
- void WhitelistUser(const std::string& email); |
- void UnwhitelistUser(const std::string& email); |
+ static void WhitelistUser(const std::string& email); |
+ static void UnwhitelistUser(const std::string& email); |
// Updates cached value of the owner. |
static void UpdateCachedOwner(const std::string& email); |