summaryrefslogtreecommitdiffstats
path: root/components/onc
diff options
context:
space:
mode:
authorstevenjb <stevenjb@chromium.org>2015-04-09 12:50:07 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-09 19:50:46 +0000
commitb7d10c9a1d93e53fa8e706d62db8a4bb68b2381d (patch)
tree51619ec2120eb48ffd0af5a85ed1b8a63df91eef /components/onc
parentfe53e50cf943cf2fa352e41e5343ea1a1d331570 (diff)
downloadchromium_src-b7d10c9a1d93e53fa8e706d62db8a4bb68b2381d.zip
chromium_src-b7d10c9a1d93e53fa8e706d62db8a4bb68b2381d.tar.gz
chromium_src-b7d10c9a1d93e53fa8e706d62db8a4bb68b2381d.tar.bz2
Replace Settings cellular carrier and activation with networkingPrivate
This uses the recent networkingPrivate changes to support setting Cellular.Carrier in setProperties and adding startActivate in internet_details.js. BUG=430115 Review URL: https://codereview.chromium.org/1046593003 Cr-Commit-Position: refs/heads/master@{#324490}
Diffstat (limited to 'components/onc')
-rw-r--r--components/onc/docs/onc_spec.html38
-rw-r--r--components/onc/onc_constants.cc11
-rw-r--r--components/onc/onc_constants.h7
3 files changed, 54 insertions, 2 deletions
diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html
index e01186e..5f001fc 100644
--- a/components/onc/docs/onc_spec.html
+++ b/components/onc/docs/onc_spec.html
@@ -2328,6 +2328,15 @@
</span>
</dd>
+ <dt class="field">PaymentPortal</dt>
+ <dd>
+ <span class="field_meta">(optional, read-only)
+ <span class="type">PaymentPortal</span>
+ </span>
+ Properties describing the online payment portal (OLP) at which a user can
+ sign up for or modify a mobile data plan.
+ </dd>
+
<dt class="field">PRLVersion</dt>
<dd>
<span class="field_meta">(optional, read-only)
@@ -2494,6 +2503,35 @@
</dd>
</dl>
+ <p><span class="type">PaymentPortal</span> type contains the following:</p>
+ <dl class="field_list">
+ <dt class="field">Method</dt>
+ <dd>
+ <span class="field_meta">(required)
+ <span class="type">string</span>
+ </span>
+ The HTTP method to use, "GET" or "POST"
+ </dd>
+
+ <dt class="field">PostData</dt>
+ <dd>
+ <span class="field_meta">
+ (required if <span class="field">Method</span> is
+ <span class="value">POST</span>, otherwise ignored)
+ <span class="type">string</span>
+ </span>
+ The postdata to send.
+ </dd>
+
+ <dt class="field">Url</dt>
+ <dd>
+ <span class="field_meta">(required)
+ <span class="type">string</span>
+ </span>
+ The URL for the portal.
+ </dd>
+ </dl>
+
<p><span class="type">CellularProvider</span> type contains the following:</p>
<dl class="field_list">
<dt class="field">Name</dt>
diff --git a/components/onc/onc_constants.cc b/components/onc/onc_constants.cc
index 6e16845..7543b6ef 100644
--- a/components/onc/onc_constants.cc
+++ b/components/onc/onc_constants.cc
@@ -114,6 +114,7 @@ const char kMEID[] = "MEID";
const char kMIN[] = "MIN";
const char kModelID[] = "ModelID";
const char kNetworkTechnology[] = "NetworkTechnology";
+const char kPaymentPortal[] = "PaymentPortal";
const char kPRLVersion[] = "PRLVersion";
const char kRoamingHome[] = "Home";
const char kRoamingRequired[] = "Required";
@@ -158,13 +159,19 @@ const char kNetworkId[] = "NetworkId";
const char kShortName[] = "ShortName";
const char kLongName[] = "LongName";
const char kTechnology[] = "Technology";
-} // namespace cellular_apn
+} // namespace cellular_found_network
+
+namespace cellular_payment_portal {
+const char kMethod[] = "Method";
+const char kPostData[] = "PostData";
+const char kUrl[] = "Url";
+} // namespace cellular_payment_portal
namespace sim_lock_status {
const char kLockEnabled[] = "LockEnabled";
const char kLockType[] = "LockType";
const char kRetriesLeft[] = "RetriesLeft";
-}
+} // namespace sim_lock_status
namespace connection_state {
const char kConnected[] = "Connected";
diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h
index a8084e8..4e8f0a5 100644
--- a/components/onc/onc_constants.h
+++ b/components/onc/onc_constants.h
@@ -132,6 +132,7 @@ ONC_EXPORT extern const char kMEID[];
ONC_EXPORT extern const char kMIN[];
ONC_EXPORT extern const char kModelID[];
ONC_EXPORT extern const char kNetworkTechnology[];
+ONC_EXPORT extern const char kPaymentPortal[];
ONC_EXPORT extern const char kPRLVersion[];
ONC_EXPORT extern const char kRoamingHome[];
ONC_EXPORT extern const char kRoamingRequired[];
@@ -178,6 +179,12 @@ ONC_EXPORT extern const char kLongName[];
ONC_EXPORT extern const char kTechnology[];
} // namespace cellular_found_network
+namespace cellular_payment_portal {
+ONC_EXPORT extern const char kMethod[];
+ONC_EXPORT extern const char kPostData[];
+ONC_EXPORT extern const char kUrl[];
+} // namespace cellular_payment_portal
+
namespace sim_lock_status {
ONC_EXPORT extern const char kLockEnabled[];
ONC_EXPORT extern const char kLockType[];