Adding policy support to the new network configuration stack.

chromeos/network/onc/onc_constants.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #ifndef CHROMEOS_NETWORK_ONC_ONC_CONSTANTS_H_
 #define CHROMEOS_NETWORK_ONC_ONC_CONSTANTS_H_
 
 #include "chromeos/chromeos_export.h"
 
 namespace chromeos {
 
 // Constants for ONC properties.
 namespace onc {
 
 // Indicates from which source an ONC blob comes from.
 enum ONCSource {
   ONC_SOURCE_NONE,
   ONC_SOURCE_USER_IMPORT,
   ONC_SOURCE_DEVICE_POLICY,
   ONC_SOURCE_USER_POLICY,
 };
 
 // These keys are used to augment the dictionary resulting from merging the
 // different settings and policies.
+
+// The setting that Shill declared to be using. For example, if no policy and no
+// user setting exists, Shill might still report a property like network
+// security options or a SSID.
+CHROMEOS_EXPORT extern const char kAugmentationActiveSetting[];
+// The one of different setting sources (user/device policy, user/shared
+// settings) that has highest priority over the others.
 CHROMEOS_EXPORT extern const char kAugmentationEffectiveSetting[];
+CHROMEOS_EXPORT extern const char kAugmentationUnmanaged[];
 CHROMEOS_EXPORT extern const char kAugmentationUserPolicy[];
 CHROMEOS_EXPORT extern const char kAugmentationDevicePolicy[];
 CHROMEOS_EXPORT extern const char kAugmentationUserSetting[];
 CHROMEOS_EXPORT extern const char kAugmentationSharedSetting[];
 CHROMEOS_EXPORT extern const char kAugmentationUserEditable[];
 CHROMEOS_EXPORT extern const char kAugmentationDeviceEditable[];
 
 // This is no ONC key or value but used for logging only.
 // TODO(pneubeck): Remove.
 CHROMEOS_EXPORT extern const char kNetworkConfiguration[];
@@ skipping 243 matching lines @@
 CHROMEOS_EXPORT extern const char kSocks[];
 CHROMEOS_EXPORT extern const char kType[];
 CHROMEOS_EXPORT extern const char kWPAD[];
 }  // namespace proxy
 
 }  // namespace onc
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_ONC_ONC_CONSTANTS_H_