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

Side by Side Diff: chrome/browser/policy/user_cloud_policy_store_base.cc

Issue 10823212: Relanding this as this did not fix the chromiumos breakage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/policy/user_cloud_policy_store_base.h" 5 #include "chrome/browser/policy/user_cloud_policy_store_base.h"
6 6
7 #include "chrome/browser/policy/cloud_policy_constants.h" 7 #include "chrome/browser/policy/cloud_policy_constants.h"
8 #include "chrome/browser/policy/proto/cloud_policy.pb.h" 8 #include "chrome/browser/policy/proto/cloud_policy.pb.h"
9 9
10 namespace policy { 10 namespace policy {
(...skipping 24 matching lines...) Expand all
35 void UserCloudPolicyStoreBase::InstallPolicy( 35 void UserCloudPolicyStoreBase::InstallPolicy(
36 scoped_ptr<enterprise_management::PolicyData> policy_data, 36 scoped_ptr<enterprise_management::PolicyData> policy_data,
37 scoped_ptr<enterprise_management::CloudPolicySettings> payload) { 37 scoped_ptr<enterprise_management::CloudPolicySettings> payload) {
38 // Decode the payload. 38 // Decode the payload.
39 policy_map_.Clear(); 39 policy_map_.Clear();
40 DecodePolicy(*payload, &policy_map_); 40 DecodePolicy(*payload, &policy_map_);
41 policy_ = policy_data.Pass(); 41 policy_ = policy_data.Pass();
42 } 42 }
43 43
44 } // namespace policy 44 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/user_cloud_policy_store_base.h ('k') | chrome/browser/policy/user_cloud_policy_store_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698