| 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 a249f6c0a49ea99d381c7e802c86c69f5b7798c5..61158bdec6e86f3b36167871e91123ba796e761f 100644
|
| --- a/chrome/browser/chromeos/user_cros_settings_provider.h
|
| +++ b/chrome/browser/chromeos/user_cros_settings_provider.h
|
| @@ -32,42 +32,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(const base::Closure& callback);
|
| - bool RequestTrustedAllowNewUser(const base::Closure& callback);
|
| - bool RequestTrustedDataRoamingEnabled(const base::Closure& callback);
|
| - bool RequestTrustedShowUsersOnSignin(const base::Closure& callback);
|
| - bool RequestTrustedOwner(const base::Closure& callback);
|
| - bool RequestTrustedReportingEnabled(const base::Closure& 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);
|
|
|