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

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

Issue 2486813002: Add DeviceADPolicyManager to provide AD policy. (Closed)
Patch Set: Address Bernhard's comments Created 4 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/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 1dd8cd4de0527520feabe881a7988b99fe539963..7c558ea78735e46ccad8ce66703fd8307cfc969b 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation.h
+++ b/chrome/browser/chromeos/settings/session_manager_operation.h
@@ -64,10 +64,6 @@ class SessionManagerOperation {
// Whether the load operation is underway.
bool is_loading() const { return is_loading_; }
- void set_force_key_load(bool force_key_load) {
- force_key_load_ = force_key_load;
- }
-
protected:
// Runs the operation. The result is reported through |callback_|.
virtual void Run() = 0;
@@ -86,6 +82,13 @@ class SessionManagerOperation {
return session_manager_client_;
}
+ // Whether to verify the loaded policy's signature against |public_key_| and
+ // perform other cloud-specific validations. (Active Directory policy has no
+ // signature that could be verified.)
+ bool cloud_validations_ = true;
+
+ bool force_key_load_ = false;
+
private:
// Loads the owner key from disk. Must be run on a thread that can do I/O.
static scoped_refptr<ownership::PublicKey> LoadPublicKey(
@@ -105,15 +108,14 @@ class SessionManagerOperation {
// Extracts status and device settings from the validator and reports them.
void ReportValidatorStatus(policy::DeviceCloudPolicyValidator* validator);
- SessionManagerClient* session_manager_client_;
+ SessionManagerClient* session_manager_client_ = nullptr;
scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
Callback callback_;
scoped_refptr<ownership::PublicKey> public_key_;
- bool force_key_load_;
- bool is_loading_;
+ bool is_loading_ = false;
std::unique_ptr<enterprise_management::PolicyData> policy_data_;
std::unique_ptr<enterprise_management::ChromeDeviceSettingsProto>
device_settings_;
@@ -127,8 +129,11 @@ class SessionManagerOperation {
// the policy blob from session manager, and validates the loaded policy blob.
class LoadSettingsOperation : public SessionManagerOperation {
public:
- // Creates a new load operation.
- explicit LoadSettingsOperation(const Callback& callback);
+ // Creates a new load operation. If |cloud_validations| is true, signature
+ // validation and other cloud-specific checks are performed.
+ LoadSettingsOperation(bool force_key_load,
+ bool cloud_validations,
+ const Callback& callback);
~LoadSettingsOperation() override;
protected:

Powered by Google App Engine
This is Rietveld 408576698