summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/device_settings_provider.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos/device_settings_provider.cc')
-rw-r--r--chrome/browser/chromeos/device_settings_provider.cc18
1 files changed, 5 insertions, 13 deletions
diff --git a/chrome/browser/chromeos/device_settings_provider.cc b/chrome/browser/chromeos/device_settings_provider.cc
index 2b297e2..b75ca81 100644
--- a/chrome/browser/chromeos/device_settings_provider.cc
+++ b/chrome/browser/chromeos/device_settings_provider.cc
@@ -650,20 +650,12 @@ const base::Value* DeviceSettingsProvider::Get(const std::string& path) const {
return NULL;
}
-bool DeviceSettingsProvider::GetTrusted(const std::string& path,
- const base::Closure& callback) {
- if (!IsControlledSetting(path)) {
- NOTREACHED();
- return true;
- }
-
- if (RequestTrustedEntity()) {
+bool DeviceSettingsProvider::PrepareTrustedValues(const base::Closure& cb) {
+ if (RequestTrustedEntity())
return true;
- } else {
- if (!callback.is_null())
- callbacks_.push_back(callback);
- return false;
- }
+ if (!cb.is_null())
+ callbacks_.push_back(cb);
+ return false;
}
bool DeviceSettingsProvider::HandlesSetting(const std::string& path) const {