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

Unified Diff: chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc

Issue 7867044: PART1: Initiated the SignedSettings refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased on ToT (solved merging conflict). Created 9 years, 1 month 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/ui/webui/options/chromeos/system_settings_provider.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc
index bc7a963050225d43ded12c299def50fc77a05cd8..3939ab6a7f741aa3eec9cf79da43d69b8ed1417b 100644
--- a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc
+++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc
@@ -211,14 +211,20 @@ void SystemSettingsProvider::DoSet(const std::string& path, Value* in_value) {
}
}
-bool SystemSettingsProvider::Get(const std::string& path,
- Value** out_value) const {
+const base::Value* SystemSettingsProvider::Get(const std::string& path) const {
if (path == kSystemTimezone) {
- *out_value = Value::CreateStringValue(GetKnownTimezoneID(
- system::TimezoneSettings::GetInstance()->GetTimezone()));
- return true;
+ // TODO(pastarmovj): Cache this in the local_state instead of locally.
+ system_timezone_.reset(base::Value::CreateStringValue(GetKnownTimezoneID(
+ system::TimezoneSettings::GetInstance()->GetTimezone())));
+ return system_timezone_.get();
}
- return false;
+ return NULL;
+}
+
+// The timezone is always trusted.
+bool SystemSettingsProvider::GetTrusted(const std::string& path,
+ const base::Closure& callback) const {
+ return true;
}
bool SystemSettingsProvider::HandlesSetting(const std::string& path) const {

Powered by Google App Engine
This is Rietveld 408576698