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

Unified Diff: chromeos/network/onc/onc_translation_tables.h

Issue 11962048: This adds Cellular to the Shill to ONC translation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix some semantics Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chromeos/network/onc/onc_translation_tables.h
diff --git a/chromeos/network/onc/onc_translation_tables.h b/chromeos/network/onc/onc_translation_tables.h
index 276b1323c27489fd04e8e9c9905cf496419c5209..d053e0bbbb583fd4f1f57189d74f3e195c0ee845 100644
--- a/chromeos/network/onc/onc_translation_tables.h
+++ b/chromeos/network/onc/onc_translation_tables.h
@@ -5,6 +5,10 @@
#ifndef CHROMEOS_NETWORK_ONC_ONC_TRANSLATION_TABLES_H_
#define CHROMEOS_NETWORK_ONC_ONC_TRANSLATION_TABLES_H_
+#include <string>
+
+#include "chromeos/chromeos_export.h"
+
namespace chromeos {
namespace onc {
@@ -15,12 +19,23 @@ struct StringTranslationEntry {
// These tables contain the mapping from ONC strings to Shill strings.
// These are NULL-terminated arrays.
-extern const StringTranslationEntry kNetworkTypeTable[];
-extern const StringTranslationEntry kVPNTypeTable[];
-extern const StringTranslationEntry kWiFiSecurityTable[];
-extern const StringTranslationEntry kEAPOuterTable[];
-extern const StringTranslationEntry kEAP_PEAP_InnerTable[];
-extern const StringTranslationEntry kEAP_TTLS_InnerTable[];
+CHROMEOS_EXPORT extern const StringTranslationEntry kNetworkTypeTable[];
pneubeck (no reviews) 2013/01/18 10:27:41 What for would we export these? The idea was to t
Greg Spencer (Chromium) 2013/01/18 22:27:44 I needed to have these, and the functions below be
pneubeck (no reviews) 2013/01/21 08:32:18 The nice thing is, that the signatures work not on
+CHROMEOS_EXPORT extern const StringTranslationEntry kVPNTypeTable[];
+CHROMEOS_EXPORT extern const StringTranslationEntry kWiFiSecurityTable[];
+CHROMEOS_EXPORT extern const StringTranslationEntry kEAPOuterTable[];
+CHROMEOS_EXPORT extern const StringTranslationEntry kEAP_PEAP_InnerTable[];
+CHROMEOS_EXPORT extern const StringTranslationEntry kEAP_TTLS_InnerTable[];
+
+// Translate individual strings to Shill using the above tables.
+CHROMEOS_EXPORT bool TranslateStringToShill(
+ const StringTranslationEntry table[],
+ const std::string& onc_value,
+ std::string* shill_value);
+
+// Translate individual strings to ONC using the above tables.
+CHROMEOS_EXPORT bool TranslateStringToONC(const StringTranslationEntry table[],
+ const std::string& shill_value,
+ std::string* onc_value);
} // namespace onc
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698