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

Unified Diff: components/policy/core/common/cloud/cloud_policy_core.cc

Issue 762863002: Removed policy::PolicyNamespaceKey. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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: components/policy/core/common/cloud/cloud_policy_core.cc
diff --git a/components/policy/core/common/cloud/cloud_policy_core.cc b/components/policy/core/common/cloud/cloud_policy_core.cc
index 7b560e7f6979fcd31460fecb70282248b3bc2c4b..dd9f46eb30158c901649bfd15db83b41352e2d54 100644
--- a/components/policy/core/common/cloud/cloud_policy_core.cc
+++ b/components/policy/core/common/cloud/cloud_policy_core.cc
@@ -17,10 +17,12 @@ namespace policy {
CloudPolicyCore::Observer::~Observer() {}
CloudPolicyCore::CloudPolicyCore(
- const PolicyNamespaceKey& key,
+ const std::string& policy_type,
+ const std::string& settings_entity_id,
CloudPolicyStore* store,
const scoped_refptr<base::SequencedTaskRunner>& task_runner)
- : policy_ns_key_(key),
+ : policy_type_(policy_type),
+ settings_entity_id_(settings_entity_id),
store_(store),
task_runner_(task_runner) {}
@@ -30,7 +32,8 @@ void CloudPolicyCore::Connect(scoped_ptr<CloudPolicyClient> client) {
CHECK(!client_);
CHECK(client);
client_ = client.Pass();
- service_.reset(new CloudPolicyService(policy_ns_key_, client_.get(), store_));
+ service_.reset(new CloudPolicyService(policy_type_, settings_entity_id_,
+ client_.get(), store_));
FOR_EACH_OBSERVER(Observer, observers_, OnCoreConnected(this));
}

Powered by Google App Engine
This is Rietveld 408576698