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

Unified Diff: chrome/browser/chromeos/settings/session_manager_operation.cc

Issue 565293003: Revert of Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/session_manager_operation.cc
diff --git a/chrome/browser/chromeos/settings/session_manager_operation.cc b/chrome/browser/chromeos/settings/session_manager_operation.cc
index 33832aa31e7ac08f8b8b6c25266c669ba98c1160..436ea0f416c62788a38e2fbb6870e72dd8237a04 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation.cc
+++ b/chrome/browser/chromeos/settings/session_manager_operation.cc
@@ -251,23 +251,22 @@
SignAndStoreSettingsOperation::~SignAndStoreSettingsOperation() {}
void SignAndStoreSettingsOperation::Run() {
- if (!owner_settings_service_) {
- ReportResult(DeviceSettingsService::STORE_KEY_UNAVAILABLE);
- return;
- }
- owner_settings_service_->IsOwnerAsync(
+ if (!delegate_) {
+ ReportResult(DeviceSettingsService::STORE_KEY_UNAVAILABLE);
+ return;
+ }
+ delegate_->IsOwnerAsync(
base::Bind(&SignAndStoreSettingsOperation::StartSigning,
weak_factory_.GetWeakPtr()));
}
void SignAndStoreSettingsOperation::StartSigning(bool is_owner) {
- if (!owner_settings_service_ || !is_owner) {
- ReportResult(DeviceSettingsService::STORE_KEY_UNAVAILABLE);
- return;
- }
-
- bool rv = owner_settings_service_->AssembleAndSignPolicyAsync(
- content::BrowserThread::GetBlockingPool(),
+ if (!delegate_ || !is_owner) {
+ ReportResult(DeviceSettingsService::STORE_KEY_UNAVAILABLE);
+ return;
+ }
+
+ bool rv = delegate_->AssembleAndSignPolicyAsync(
new_policy_.Pass(),
base::Bind(&SignAndStoreSettingsOperation::StoreDeviceSettingsBlob,
weak_factory_.GetWeakPtr()));

Powered by Google App Engine
This is Rietveld 408576698