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

Side by Side Diff: components/onc/onc_constants.h

Issue 551753002: ONC: Remove augmentation of unmanaged network properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ipconfig
Patch Set: Created 6 years, 3 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
« no previous file with comments | « chromeos/test/data/network/augmented_merge.json ('k') | components/onc/onc_constants.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef COMPONENTS_ONC_ONC_CONSTANTS_H_ 4 #ifndef COMPONENTS_ONC_ONC_CONSTANTS_H_
5 #define COMPONENTS_ONC_ONC_CONSTANTS_H_ 5 #define COMPONENTS_ONC_ONC_CONSTANTS_H_
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "components/onc/onc_export.h" 9 #include "components/onc/onc_export.h"
10 10
(...skipping 11 matching lines...) Expand all
22 // These keys are used to augment the dictionary resulting from merging the 22 // These keys are used to augment the dictionary resulting from merging the
23 // different settings and policies. 23 // different settings and policies.
24 24
25 // The setting that Shill declared to be using. For example, if no policy and no 25 // The setting that Shill declared to be using. For example, if no policy and no
26 // user setting exists, Shill might still report a property like network 26 // user setting exists, Shill might still report a property like network
27 // security options or a SSID. 27 // security options or a SSID.
28 ONC_EXPORT extern const char kAugmentationActiveSetting[]; 28 ONC_EXPORT extern const char kAugmentationActiveSetting[];
29 // The one of different setting sources (user/device policy, user/shared 29 // The one of different setting sources (user/device policy, user/shared
30 // settings) that has highest priority over the others. 30 // settings) that has highest priority over the others.
31 ONC_EXPORT extern const char kAugmentationEffectiveSetting[]; 31 ONC_EXPORT extern const char kAugmentationEffectiveSetting[];
32 ONC_EXPORT extern const char kAugmentationUnmanaged[];
33 ONC_EXPORT extern const char kAugmentationUserPolicy[]; 32 ONC_EXPORT extern const char kAugmentationUserPolicy[];
34 ONC_EXPORT extern const char kAugmentationDevicePolicy[]; 33 ONC_EXPORT extern const char kAugmentationDevicePolicy[];
35 ONC_EXPORT extern const char kAugmentationUserSetting[]; 34 ONC_EXPORT extern const char kAugmentationUserSetting[];
36 ONC_EXPORT extern const char kAugmentationSharedSetting[]; 35 ONC_EXPORT extern const char kAugmentationSharedSetting[];
37 ONC_EXPORT extern const char kAugmentationUserEditable[]; 36 ONC_EXPORT extern const char kAugmentationUserEditable[];
38 ONC_EXPORT extern const char kAugmentationDeviceEditable[]; 37 ONC_EXPORT extern const char kAugmentationDeviceEditable[];
39 38
40 // This is no ONC key or value but used for logging only. 39 // This is no ONC key or value but used for logging only.
41 // TODO(pneubeck): Remove. 40 // TODO(pneubeck): Remove.
42 ONC_EXPORT extern const char kNetworkConfiguration[]; 41 ONC_EXPORT extern const char kNetworkConfiguration[];
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 ONC_EXPORT extern const char kWPAD[]; 362 ONC_EXPORT extern const char kWPAD[];
364 } // namespace proxy 363 } // namespace proxy
365 364
366 namespace global_network_config { 365 namespace global_network_config {
367 ONC_EXPORT extern const char kAllowOnlyPolicyNetworksToAutoconnect[]; 366 ONC_EXPORT extern const char kAllowOnlyPolicyNetworksToAutoconnect[];
368 } // global_network_config 367 } // global_network_config
369 368
370 } // namespace onc 369 } // namespace onc
371 370
372 #endif // COMPONENTS_ONC_ONC_CONSTANTS_H_ 371 #endif // COMPONENTS_ONC_ONC_CONSTANTS_H_
OLDNEW
« no previous file with comments | « chromeos/test/data/network/augmented_merge.json ('k') | components/onc/onc_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698