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

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

Issue 571123002: Fix some properties on the settings page read from ONC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added TODO. 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
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_translation_tables.h" 5 #include "chromeos/network/onc/onc_translation_tables.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "components/onc/onc_constants.h" 10 #include "components/onc/onc_constants.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 { ::onc::sim_lock_status::kLockType, shill::kSIMLockTypeProperty}, 147 { ::onc::sim_lock_status::kLockType, shill::kSIMLockTypeProperty},
148 { ::onc::sim_lock_status::kRetriesLeft, shill::kSIMLockRetriesLeftProperty}, 148 { ::onc::sim_lock_status::kRetriesLeft, shill::kSIMLockRetriesLeftProperty},
149 {NULL}}; 149 {NULL}};
150 150
151 // This must only contain Service properties and not Device properties. 151 // This must only contain Service properties and not Device properties.
152 // For Device properties see kCellularDeviceTable. 152 // For Device properties see kCellularDeviceTable.
153 const FieldTranslationEntry cellular_fields[] = { 153 const FieldTranslationEntry cellular_fields[] = {
154 { ::onc::cellular::kActivationType, shill::kActivationTypeProperty}, 154 { ::onc::cellular::kActivationType, shill::kActivationTypeProperty},
155 // This field is converted during translation, see onc_translator_*. 155 // This field is converted during translation, see onc_translator_*.
156 // { ::onc::cellular::kActivationState, shill::kActivationStateProperty}, 156 // { ::onc::cellular::kActivationState, shill::kActivationStateProperty},
157 { ::onc::vpn::kAutoConnect, shill::kAutoConnectProperty},
157 { ::onc::cellular::kNetworkTechnology, shill::kNetworkTechnologyProperty}, 158 { ::onc::cellular::kNetworkTechnology, shill::kNetworkTechnologyProperty},
158 // This field is converted during translation, see onc_translator_*. 159 // This field is converted during translation, see onc_translator_*.
159 // { ::onc::cellular::kRoamingState, shill::kRoamingStateProperty}, 160 // { ::onc::cellular::kRoamingState, shill::kRoamingStateProperty},
160 {NULL}}; 161 {NULL}};
161 162
162 const FieldTranslationEntry network_fields[] = { 163 const FieldTranslationEntry network_fields[] = {
163 { ::onc::network_config::kGUID, shill::kGuidProperty}, 164 { ::onc::network_config::kGUID, shill::kGuidProperty},
164 { ::onc::network_config::kConnectable, shill::kConnectableProperty }, 165 { ::onc::network_config::kConnectable, shill::kConnectableProperty },
165 { ::onc::network_config::kErrorState, shill::kErrorProperty }, 166 { ::onc::network_config::kErrorState, shill::kErrorProperty },
166 { ::onc::network_config::kPriority, shill::kPriorityProperty }, 167 { ::onc::network_config::kPriority, shill::kPriorityProperty },
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 continue; 406 continue;
406 *onc_value = table[i].onc_value; 407 *onc_value = table[i].onc_value;
407 return true; 408 return true;
408 } 409 }
409 LOG(ERROR) << "Value '" << shill_value << "' cannot be translated to ONC"; 410 LOG(ERROR) << "Value '" << shill_value << "' cannot be translated to ONC";
410 return false; 411 return false;
411 } 412 }
412 413
413 } // namespace onc 414 } // namespace onc
414 } // namespace chromeos 415 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/onc/onc_signature.cc ('k') | chromeos/network/onc/onc_translator_shill_to_onc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698