X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchromeos%2Fnetwork%2Fnetwork_ui_data.cc;h=b5c09df0b6569326b0ee02a568822e646d57e780;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=65ac5f3e597b4284e018a28b63d52d9e13627da9;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chromeos/network/network_ui_data.cc b/src/chromeos/network/network_ui_data.cc index 65ac5f3..b5c09df 100644 --- a/src/chromeos/network/network_ui_data.cc +++ b/src/chromeos/network/network_ui_data.cc @@ -15,6 +15,9 @@ const char NetworkUIData::kKeyONCSource[] = "onc_source"; const char NetworkUIData::kKeyCertificatePattern[] = "certificate_pattern"; const char NetworkUIData::kKeyCertificateType[] = "certificate_type"; const char NetworkUIData::kKeyUserSettings[] = "user_settings"; +const char NetworkUIData::kONCSourceUserImport[] = "user_import"; +const char NetworkUIData::kONCSourceDevicePolicy[] = "device_policy"; +const char NetworkUIData::kONCSourceUserPolicy[] = "user_policy"; namespace { @@ -25,9 +28,9 @@ struct StringEnumEntry { }; const StringEnumEntry< ::onc::ONCSource> kONCSourceTable[] = { - { "user_import", ::onc::ONC_SOURCE_USER_IMPORT }, - { "device_policy", ::onc::ONC_SOURCE_DEVICE_POLICY }, - { "user_policy", ::onc::ONC_SOURCE_USER_POLICY } + { NetworkUIData::kONCSourceUserImport, ::onc::ONC_SOURCE_USER_IMPORT }, + { NetworkUIData::kONCSourceDevicePolicy, ::onc::ONC_SOURCE_DEVICE_POLICY }, + { NetworkUIData::kONCSourceUserPolicy, ::onc::ONC_SOURCE_USER_POLICY } }; const StringEnumEntry kClientCertTable[] = { @@ -117,10 +120,14 @@ void NetworkUIData::set_user_settings(scoped_ptr dict) { user_settings_ = dict.Pass(); } +std::string NetworkUIData::GetONCSourceAsString() const { + return EnumToString(kONCSourceTable, onc_source_); +} + void NetworkUIData::FillDictionary(base::DictionaryValue* dict) const { dict->Clear(); - std::string source_string = EnumToString(kONCSourceTable, onc_source_); + std::string source_string = GetONCSourceAsString(); if (!source_string.empty()) dict->SetString(kKeyONCSource, source_string);