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

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

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.h
diff --git a/chrome/browser/chromeos/settings/session_manager_operation.h b/chrome/browser/chromeos/settings/session_manager_operation.h
index 66ba738c4533f33bfde35838832b890eebbc6ab3..a7484b521853f708a71f042db94060c1fce2cae9 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation.h
+++ b/chrome/browser/chromeos/settings/session_manager_operation.h
@@ -11,7 +11,6 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/policy/device_cloud_policy_validator.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "components/ownership/owner_settings_service.h"
#include "net/cert/x509_util_nss.h"
namespace enterprise_management {
@@ -70,9 +69,9 @@
void set_username(const std::string& username) { username_ = username; }
- void set_owner_settings_service(const base::WeakPtr<
- ownership::OwnerSettingsService>& owner_settings_service) {
- owner_settings_service_ = owner_settings_service;
+ void set_delegate(const base::WeakPtr<
+ DeviceSettingsService::PrivateKeyDelegate>& delegate) {
+ delegate_ = delegate;
}
protected:
@@ -93,7 +92,7 @@
return session_manager_client_;
}
- base::WeakPtr<ownership::OwnerSettingsService> owner_settings_service_;
+ base::WeakPtr<DeviceSettingsService::PrivateKeyDelegate> delegate_;
private:
// Loads the owner key from disk. Must be run on a thread that can do I/O.

Powered by Google App Engine
This is Rietveld 408576698