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

Side by Side Diff: chromeos/network/onc/onc_utils.cc

Issue 12676017: Adding policy support to the new network configuration stack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed clang errors. Created 7 years, 8 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
« no previous file with comments | « chromeos/network/onc/onc_utils.h ('k') | chromeos/network/onc/onc_utils_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chromeos/network/onc/onc_utils.h" 5 #include "chromeos/network/onc/onc_utils.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chromeos/network/network_event_log.h" 12 #include "chromeos/network/network_event_log.h"
13 #include "chromeos/network/onc/onc_mapper.h" 13 #include "chromeos/network/onc/onc_mapper.h"
14 #include "chromeos/network/onc/onc_signature.h"
14 #include "crypto/encryptor.h" 15 #include "crypto/encryptor.h"
15 #include "crypto/hmac.h" 16 #include "crypto/hmac.h"
16 #include "crypto/symmetric_key.h" 17 #include "crypto/symmetric_key.h"
17 18
18 #define ONC_LOG_WARNING(message) NET_LOG_WARNING("ONC", message) 19 #define ONC_LOG_WARNING(message) NET_LOG_WARNING("ONC", message)
19 #define ONC_LOG_ERROR(message) NET_LOG_ERROR("ONC", message) 20 #define ONC_LOG_ERROR(message) NET_LOG_ERROR("ONC", message)
20 21
21 namespace chromeos { 22 namespace chromeos {
22 namespace onc { 23 namespace onc {
23 24
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 257
257 CHROMEOS_EXPORT scoped_ptr<base::DictionaryValue> MaskCredentialsInOncObject( 258 CHROMEOS_EXPORT scoped_ptr<base::DictionaryValue> MaskCredentialsInOncObject(
258 const onc::OncValueSignature& signature, 259 const onc::OncValueSignature& signature,
259 const base::DictionaryValue& onc_object, 260 const base::DictionaryValue& onc_object,
260 const std::string& mask) { 261 const std::string& mask) {
261 return OncMaskValues::Mask(signature, onc_object, mask); 262 return OncMaskValues::Mask(signature, onc_object, mask);
262 } 263 }
263 264
264 } // namespace onc 265 } // namespace onc
265 } // namespace chromeos 266 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/onc/onc_utils.h ('k') | chromeos/network/onc/onc_utils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698