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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

Issue 535283002: Translate activation/romaing state, restricted pool (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_279351_internet_options_7b
Patch Set: Rebase 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 "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" 5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
6 6
7 #include <ctype.h> 7 #include <ctype.h>
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 const char kSetAutoConnectMessage[] = "setAutoConnect"; 118 const char kSetAutoConnectMessage[] = "setAutoConnect";
119 const char kSetCarrierMessage[] = "setCarrier"; 119 const char kSetCarrierMessage[] = "setCarrier";
120 const char kSetIPConfigMessage[] = "setIPConfig"; 120 const char kSetIPConfigMessage[] = "setIPConfig";
121 const char kSetPreferNetworkMessage[] = "setPreferNetwork"; 121 const char kSetPreferNetworkMessage[] = "setPreferNetwork";
122 const char kSetServerHostname[] = "setServerHostname"; 122 const char kSetServerHostname[] = "setServerHostname";
123 const char kSetSimCardLockMessage[] = "setSimCardLock"; 123 const char kSetSimCardLockMessage[] = "setSimCardLock";
124 const char kShowMorePlanInfoMessage[] = "showMorePlanInfo"; 124 const char kShowMorePlanInfoMessage[] = "showMorePlanInfo";
125 125
126 // These are strings used to communicate with JavaScript. 126 // These are strings used to communicate with JavaScript.
127 const char kTagActivate[] = "activate"; 127 const char kTagActivate[] = "activate";
128 const char kTagActivationState[] = "activationState";
129 const char kTagAddConnection[] = "add"; 128 const char kTagAddConnection[] = "add";
130 const char kTagCarrierSelectFlag[] = "showCarrierSelect"; 129 const char kTagCarrierSelectFlag[] = "showCarrierSelect";
131 const char kTagCarrierUrl[] = "carrierUrl"; 130 const char kTagCarrierUrl[] = "carrierUrl";
132 const char kTagCellularAvailable[] = "cellularAvailable"; 131 const char kTagCellularAvailable[] = "cellularAvailable";
133 const char kTagCellularEnabled[] = "cellularEnabled"; 132 const char kTagCellularEnabled[] = "cellularEnabled";
134 const char kTagCellularSupportsScan[] = "cellularSupportsScan"; 133 const char kTagCellularSupportsScan[] = "cellularSupportsScan";
135 const char kTagConfigure[] = "configure"; 134 const char kTagConfigure[] = "configure";
136 const char kTagConnect[] = "connect"; 135 const char kTagConnect[] = "connect";
137 const char kTagControlledBy[] = "controlledBy"; 136 const char kTagControlledBy[] = "controlledBy";
138 const char kTagDeviceConnected[] = "deviceConnected"; 137 const char kTagDeviceConnected[] = "deviceConnected";
139 const char kTagDisconnect[] = "disconnect"; 138 const char kTagDisconnect[] = "disconnect";
140 const char kTagErrorMessage[] = "errorMessage"; 139 const char kTagErrorMessage[] = "errorMessage";
141 const char kTagForget[] = "forget"; 140 const char kTagForget[] = "forget";
142 const char kTagNameServersGoogle[] = "nameServersGoogle"; 141 const char kTagNameServersGoogle[] = "nameServersGoogle";
143 const char kTagNameServerType[] = "nameServerType"; 142 const char kTagNameServerType[] = "nameServerType";
144 const char kTagOptions[] = "options"; 143 const char kTagOptions[] = "options";
145 const char kTagPolicy[] = "policy"; 144 const char kTagPolicy[] = "policy";
146 const char kTagRecommended[] = "recommended"; 145 const char kTagRecommended[] = "recommended";
147 const char kTagRecommendedValue[] = "recommendedValue"; 146 const char kTagRecommendedValue[] = "recommendedValue";
148 const char kTagRemembered[] = "remembered"; 147 const char kTagRemembered[] = "remembered";
149 const char kTagRememberedList[] = "rememberedList"; 148 const char kTagRememberedList[] = "rememberedList";
150 const char kTagRestrictedPool[] = "restrictedPool";
151 const char kTagRoamingState[] = "roamingState";
152 const char kTagCarriers[] = "carriers"; 149 const char kTagCarriers[] = "carriers";
153 const char kTagCurrentCarrierIndex[] = "currentCarrierIndex"; 150 const char kTagCurrentCarrierIndex[] = "currentCarrierIndex";
154 const char kTagShared[] = "shared"; 151 const char kTagShared[] = "shared";
155 const char kTagShowActivateButton[] = "showActivateButton"; 152 const char kTagShowActivateButton[] = "showActivateButton";
156 const char kTagShowViewAccountButton[] = "showViewAccountButton"; 153 const char kTagShowViewAccountButton[] = "showViewAccountButton";
157 const char kTagTrue[] = "true"; 154 const char kTagTrue[] = "true";
158 const char kTagValue[] = "value"; 155 const char kTagValue[] = "value";
159 const char kTagVpnList[] = "vpnList"; 156 const char kTagVpnList[] = "vpnList";
160 const char kTagWifiAvailable[] = "wifiAvailable"; 157 const char kTagWifiAvailable[] = "wifiAvailable";
161 const char kTagWifiEnabled[] = "wifiEnabled"; 158 const char kTagWifiEnabled[] = "wifiEnabled";
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 return index; 461 return index;
465 } 462 }
466 return -1; 463 return -1;
467 } 464 }
468 465
469 void PopulateCellularDetails(const NetworkState* cellular, 466 void PopulateCellularDetails(const NetworkState* cellular,
470 base::DictionaryValue* dictionary) { 467 base::DictionaryValue* dictionary) {
471 dictionary->SetBoolean(kTagCarrierSelectFlag, 468 dictionary->SetBoolean(kTagCarrierSelectFlag,
472 CommandLine::ForCurrentProcess()->HasSwitch( 469 CommandLine::ForCurrentProcess()->HasSwitch(
473 chromeos::switches::kEnableCarrierSwitching)); 470 chromeos::switches::kEnableCarrierSwitching));
474 // Cellular network / connection settings.
475 dictionary->SetString(kTagActivationState,
476 internet_options_strings::ActivationStateString(
477 cellular->activation_state()));
478 dictionary->SetString(kTagRoamingState,
479 internet_options_strings::RoamingStateString(
480 cellular->roaming()));
481 dictionary->SetString(kTagRestrictedPool,
482 internet_options_strings::RestrictedStateString(
483 cellular->connection_state()));
484 471
485 // These default to empty and are only set if device != NULL. 472 // These default to empty and are only set if device != NULL.
486 std::string carrier_id; 473 std::string carrier_id;
487 std::string mdn; 474 std::string mdn;
488 475
489 // Device settings. 476 // Device settings.
490 const DeviceState* device = 477 const DeviceState* device =
491 NetworkHandler::Get()->network_state_handler()->GetDeviceState( 478 NetworkHandler::Get()->network_state_handler()->GetDeviceState(
492 cellular->device_path()); 479 cellular->device_path());
493 if (device) { 480 if (device) {
(...skipping 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 dictionary->SetBoolean( 1524 dictionary->SetBoolean(
1538 kTagWimaxAvailable, 1525 kTagWimaxAvailable,
1539 handler->IsTechnologyAvailable(NetworkTypePattern::Wimax())); 1526 handler->IsTechnologyAvailable(NetworkTypePattern::Wimax()));
1540 dictionary->SetBoolean( 1527 dictionary->SetBoolean(
1541 kTagWimaxEnabled, 1528 kTagWimaxEnabled,
1542 handler->IsTechnologyEnabled(NetworkTypePattern::Wimax())); 1529 handler->IsTechnologyEnabled(NetworkTypePattern::Wimax()));
1543 } 1530 }
1544 1531
1545 } // namespace options 1532 } // namespace options
1546 } // namespace chromeos 1533 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698