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

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

Issue 762863002: Removed policy::PolicyNamespaceKey. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pass values in ctors 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/component_cloud_policy_service.cc
diff --git a/components/policy/core/common/cloud/component_cloud_policy_service.cc b/components/policy/core/common/cloud/component_cloud_policy_service.cc
index 0ba5db11f3d5736ce033cf6d8615c8abe48624f6..ab2c6be17e612469e57cfc6392479bc8470745aa 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_service.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_service.cc
@@ -32,10 +32,12 @@ namespace {
bool NotInSchemaMap(const scoped_refptr<SchemaMap> schema_map,
PolicyDomain domain,
const std::string& component_id) {
- return schema_map->GetSchema(PolicyNamespace(domain, component_id)) == NULL;
+ return schema_map->GetSchema(PolicyNamespace(domain, component_id)) ==
+ nullptr;
}
-bool ToPolicyNamespace(const PolicyNamespaceKey& key, PolicyNamespace* ns) {
+bool ToPolicyNamespace(const std::pair<std::string, std::string>& key,
+ PolicyNamespace* ns) {
if (!ComponentCloudPolicyStore::GetPolicyDomain(key.first, &ns->domain))
return false;
ns->component_id = key.second;
@@ -304,8 +306,8 @@ void ComponentCloudPolicyService::OnCoreConnected(CloudPolicyCore* core) {
core_->client()->AddObserver(this);
// Register the supported policy domains at the client.
- core_->client()->AddNamespaceToFetch(
- PolicyNamespaceKey(dm_protocol::kChromeExtensionPolicyType, ""));
+ core_->client()->AddPolicyTypeToFetch(
+ dm_protocol::kChromeExtensionPolicyType, std::string());
// Immediately load any PolicyFetchResponses that the client may already
// have if the backend is ready.
@@ -320,8 +322,8 @@ void ComponentCloudPolicyService::OnCoreDisconnecting(CloudPolicyCore* core) {
core_->client()->RemoveObserver(this);
// Remove all the namespaces from the client.
- core_->client()->RemoveNamespaceToFetch(
- PolicyNamespaceKey(dm_protocol::kChromeExtensionPolicyType, ""));
+ core_->client()->RemovePolicyTypeToFetch(
+ dm_protocol::kChromeExtensionPolicyType, std::string());
}
void ComponentCloudPolicyService::OnRefreshSchedulerStarted(
@@ -396,8 +398,7 @@ void ComponentCloudPolicyService::OnPolicyFetched(CloudPolicyClient* client) {
// Backend.
const CloudPolicyClient::ResponseMap& responses =
core_->client()->responses();
- for (CloudPolicyClient::ResponseMap::const_iterator it = responses.begin();
- it != responses.end(); ++it) {
+ for (auto it = responses.begin(); it != responses.end(); ++it) {
PolicyNamespace ns;
if (ToPolicyNamespace(it->first, &ns) &&
current_schema_map_->GetSchema(ns)) {

Powered by Google App Engine
This is Rietveld 408576698