Commit b5a81099 authored by Steven Bennetts's avatar Steven Bennetts Committed by Commit Bot

OOBE: Remove 'Add other mobile network'

This is now part of the details dialog for the Cellular
network.

BUG=717063

Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ib221c819fe0f76220d7bbd88d30525df171581a7
Reviewed-on: https://chromium-review.googlesource.com/669952Reviewed-by: default avatarToni Barzic <tbarzic@chromium.org>
Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#502934}
parent 21d285cc
...@@ -1530,9 +1530,6 @@ Press any key to continue exploring. ...@@ -1530,9 +1530,6 @@ Press any key to continue exploring.
<message name="IDS_ADD_WI_FI_NETWORK_MENU_NAME" desc="OOBE 'Available Networks' list menu entry that opens 'Add New WiFi Network' dialog"> <message name="IDS_ADD_WI_FI_NETWORK_MENU_NAME" desc="OOBE 'Available Networks' list menu entry that opens 'Add New WiFi Network' dialog">
Add other WiFi network Add other WiFi network
</message> </message>
<message name="IDS_ADD_MOBILE_NETWORK_MENU_NAME" desc="OOBE 'Available Networks' list menu entry that opens 'Add New Mobile Network' dialog">
Add other mobile network
</message>
<message name="IDS_AUTOSTART_WARNING_TITLE" desc="Title of the kiosk autostart screen"> <message name="IDS_AUTOSTART_WARNING_TITLE" desc="Title of the kiosk autostart screen">
Auto-launch permission requested Auto-launch permission requested
</message> </message>
......
...@@ -73,6 +73,34 @@ ...@@ -73,6 +73,34 @@
</paper-button> </paper-button>
</div> </div>
<!-- Device properties (Cellular only) -->
<div class="section single-column">
<network-property-list
hidden$="[[!hasDeviceFields_(networkProperties)]]"
fields="[[getDeviceFields_(networkProperties)]]"
property-dict="[[networkProperties]]">
</network-property-list>
</div>
<!-- Choose Mobile Network (Cellular only) -->
<template is="dom-if"
if="[[showCellularChooseNetwork_(networkProperties)]]">
<div class="section single-column">
<network-choose-mobile networking-private="[[networkingPrivate]]"
network-properties="[[networkProperties]]">
</network-choose-mobile>
</div>
</template>
<!-- APN (Cellular only) -->
<template is="dom-if" if="[[isCellular_(networkProperties)]]">
<div class="section single-column">
<network-apnlist editable on-apn-change="onNetworkPropertyChange_"
network-properties="[[networkProperties]]">
</network-apnlist>
</div>
</template>
<!-- Proxy --> <!-- Proxy -->
<div class="section single-column"> <div class="section single-column">
<network-proxy editable use-shared-proxies <network-proxy editable use-shared-proxies
...@@ -99,25 +127,6 @@ ...@@ -99,25 +127,6 @@
</div> </div>
</template> </template>
<!-- Choose Mobile Network (Cellular only). -->
<template is="dom-if"
if="[[showCellularChooseNetwork_(networkProperties)]]">
<div class="section single-column">
<network-choose-mobile networking-private="[[networkingPrivate]]"
network-properties="[[networkProperties]]">
</network-choose-mobile>
</div>
</template>
<!-- APN (Cellular only) -->
<template is="dom-if" if="[[isCellular_(networkProperties)]]">
<div class="section single-column">
<network-apnlist editable on-apn-change="onNetworkPropertyChange_"
network-properties="[[networkProperties]]">
</network-apnlist>
</div>
</template>
<!-- Other properties to show if present. --> <!-- Other properties to show if present. -->
<template is="dom-if" if="[[hasInfoFields_(networkProperties)]]"> <template is="dom-if" if="[[hasInfoFields_(networkProperties)]]">
<div class="section single-column indented"> <div class="section single-column indented">
......
...@@ -419,6 +419,29 @@ Polymer({ ...@@ -419,6 +419,29 @@ Polymer({
}); });
}, },
/**
* @return {boolean}
* @private
*/
hasDeviceFields_: function() {
return this.hasVisibleFields_(this.getDeviceFields_());
},
/**
* @return {!Array<string>} The fields to display in the device section.
* @private
*/
getDeviceFields_: function() {
/** @type {!Array<string>} */ var fields = [];
if (this.networkProperties.Type == CrOnc.Type.CELLULAR) {
fields.push(
'Cellular.HomeProvider.Name', 'Cellular.ESN', 'Cellular.ICCID',
'Cellular.IMEI', 'Cellular.IMSI', 'Cellular.MDN', 'Cellular.MEID',
'Cellular.MIN');
}
return fields;
},
/** /**
* @return {boolean} * @return {boolean}
* @private * @private
......
...@@ -130,8 +130,6 @@ Polymer({ ...@@ -130,8 +130,6 @@ Polymer({
vpnNameTemplate: loadTimeData.getString('vpnNameTemplate'), vpnNameTemplate: loadTimeData.getString('vpnNameTemplate'),
// Additional strings for custom items. // Additional strings for custom items.
addMobileNetworkMenuName:
loadTimeData.getString('addMobileNetworkMenuName'),
addWiFiNetworkMenuName: loadTimeData.getString('addWiFiNetworkMenuName'), addWiFiNetworkMenuName: loadTimeData.getString('addWiFiNetworkMenuName'),
proxySettingsMenuName: loadTimeData.getString('proxySettingsMenuName'), proxySettingsMenuName: loadTimeData.getString('proxySettingsMenuName'),
}; };
...@@ -210,8 +208,9 @@ Polymer({ ...@@ -210,8 +208,9 @@ Polymer({
*/ */
getNetworkCustomItems_: function(isConnected_) { getNetworkCustomItems_: function(isConnected_) {
var self = this; var self = this;
var items = [ var items = [];
{ if (isConnected_) {
items.push({
customItemName: 'proxySettingsMenuName', customItemName: 'proxySettingsMenuName',
polymerIcon: 'oobe-welcome-20:add-proxy', polymerIcon: 'oobe-welcome-20:add-proxy',
customData: { customData: {
...@@ -219,29 +218,18 @@ Polymer({ ...@@ -219,29 +218,18 @@ Polymer({
self.OpenProxySettingsDialog_(); self.OpenProxySettingsDialog_();
}, },
}, },
}, });
{ }
customItemName: 'addWiFiNetworkMenuName', items.push({
polymerIcon: 'oobe-welcome-20:add-wifi', customItemName: 'addWiFiNetworkMenuName',
customData: { polymerIcon: 'oobe-welcome-20:add-wifi',
onTap: function() { customData: {
self.OpenAddWiFiNetworkDialog_(); onTap: function() {
}, self.OpenAddWiFiNetworkDialog_();
},
},
{
customItemName: 'addMobileNetworkMenuName',
polymerIcon: 'oobe-welcome-20:add-cellular',
customData: {
onTap: function() {
self.OpenAddMobileNetworkDialog_();
},
}, },
}, },
]; });
if (isConnected_) return items;
return items;
return items.slice(1);
}, },
/** /**
...@@ -315,15 +303,6 @@ Polymer({ ...@@ -315,15 +303,6 @@ Polymer({
chrome.send('launchAddWiFiNetworkDialog'); chrome.send('launchAddWiFiNetworkDialog');
}, },
/**
* Handle Network Setup screen "Add cellular network" button.
*
* @private
*/
OpenAddMobileNetworkDialog_: function(item) {
chrome.send('launchAddMobileNetworkDialog');
},
/** /**
* This is called when network setup is done. * This is called when network setup is done.
* *
...@@ -377,6 +356,13 @@ Polymer({ ...@@ -377,6 +356,13 @@ Polymer({
var self = this; var self = this;
var networkStateCopy = Object.assign({}, state); var networkStateCopy = Object.assign({}, state);
// TODO(stevenjb): Do this when state.Connectable == false once network
// configuration is integrated into the Settings UI / details dialog.
if (state.Type == chrome.networkingPrivate.NetworkType.CELLULAR) {
chrome.send('showNetworkDetails', [state.GUID]);
return;
}
chrome.networkingPrivate.startConnect(state.GUID, function() { chrome.networkingPrivate.startConnect(state.GUID, function() {
var lastError = chrome.runtime.lastError; var lastError = chrome.runtime.lastError;
if (!lastError) if (!lastError)
......
...@@ -4,11 +4,15 @@ ...@@ -4,11 +4,15 @@
#include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h" #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
#include "chrome/browser/chromeos/login/ui/login_display_host.h"
#include "chrome/browser/chromeos/login/ui/webui_login_display.h" #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
#include "chrome/browser/chromeos/options/network_config_view.h" #include "chrome/browser/chromeos/options/network_config_view.h"
#include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h" #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
#include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h" #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
#include "chrome/grit/generated_resources.h" #include "chrome/grit/generated_resources.h"
#include "chromeos/network/network_handler.h"
#include "chromeos/network/network_state_handler.h"
#include "chromeos/network/network_type_pattern.h"
#include "components/login/localized_values_builder.h" #include "components/login/localized_values_builder.h"
#include "third_party/cros_system_api/dbus/service_constants.h" #include "third_party/cros_system_api/dbus/service_constants.h"
...@@ -23,8 +27,7 @@ const char kJsApiNetworkDropdownHide[] = "networkDropdownHide"; ...@@ -23,8 +27,7 @@ const char kJsApiNetworkDropdownHide[] = "networkDropdownHide";
const char kJsApiNetworkDropdownRefresh[] = "networkDropdownRefresh"; const char kJsApiNetworkDropdownRefresh[] = "networkDropdownRefresh";
const char kJsApiLaunchProxySettingsDialog[] = "launchProxySettingsDialog"; const char kJsApiLaunchProxySettingsDialog[] = "launchProxySettingsDialog";
const char kJsApiLaunchAddWiFiNetworkDialog[] = "launchAddWiFiNetworkDialog"; const char kJsApiLaunchAddWiFiNetworkDialog[] = "launchAddWiFiNetworkDialog";
const char kJsApiLaunchAddMobileNetworkDialog[] = const char kJsApiShowNetworkDetails[] = "showNetworkDetails";
"launchAddMobileNetworkDialog";
} // namespace } // namespace
...@@ -70,21 +73,32 @@ void NetworkDropdownHandler::RegisterMessages() { ...@@ -70,21 +73,32 @@ void NetworkDropdownHandler::RegisterMessages() {
&NetworkDropdownHandler::HandleLaunchProxySettingsDialog); &NetworkDropdownHandler::HandleLaunchProxySettingsDialog);
AddCallback(kJsApiLaunchAddWiFiNetworkDialog, AddCallback(kJsApiLaunchAddWiFiNetworkDialog,
&NetworkDropdownHandler::HandleLaunchAddWiFiNetworkDialog); &NetworkDropdownHandler::HandleLaunchAddWiFiNetworkDialog);
AddCallback(kJsApiLaunchAddMobileNetworkDialog, AddRawCallback(kJsApiShowNetworkDetails,
&NetworkDropdownHandler::HandleLaunchAddMobileNetworkDialog); &NetworkDropdownHandler::HandleShowNetworkDetails);
} }
void NetworkDropdownHandler::HandleLaunchProxySettingsDialog() { void NetworkDropdownHandler::HandleLaunchProxySettingsDialog() {
dropdown_->OpenButtonOptions(); // Empty string opens the internet detail dialog for the default network.
LoginDisplayHost::default_host()->OpenProxySettings("");
} }
void NetworkDropdownHandler::HandleLaunchAddWiFiNetworkDialog() { void NetworkDropdownHandler::HandleLaunchAddWiFiNetworkDialog() {
// Make sure WiFi is enabled.
NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
if (handler->GetTechnologyState(NetworkTypePattern::WiFi()) !=
NetworkStateHandler::TECHNOLOGY_ENABLED) {
handler->SetTechnologyEnabled(NetworkTypePattern::WiFi(), true,
network_handler::ErrorCallback());
}
NetworkConfigView::ShowForType(shill::kTypeWifi); NetworkConfigView::ShowForType(shill::kTypeWifi);
} }
void NetworkDropdownHandler::HandleLaunchAddMobileNetworkDialog() { void NetworkDropdownHandler::HandleShowNetworkDetails(
gfx::NativeWindow native_window = GetNativeWindow(); const base::ListValue* args) {
ChooseMobileNetworkDialog::ShowDialog(native_window); std::string guid;
args->GetString(0, &guid);
// OpenProxySettings shows the internet detail dialog for the network.
LoginDisplayHost::default_host()->OpenProxySettings(guid);
} }
void NetworkDropdownHandler::OnConnectToNetworkRequested() { void NetworkDropdownHandler::OnConnectToNetworkRequested() {
......
...@@ -54,7 +54,7 @@ class NetworkDropdownHandler : public BaseWebUIHandler, ...@@ -54,7 +54,7 @@ class NetworkDropdownHandler : public BaseWebUIHandler,
void HandleLaunchProxySettingsDialog(); void HandleLaunchProxySettingsDialog();
void HandleLaunchAddWiFiNetworkDialog(); void HandleLaunchAddWiFiNetworkDialog();
void HandleLaunchAddMobileNetworkDialog(); void HandleShowNetworkDetails(const base::ListValue* args);
std::unique_ptr<NetworkDropdown> dropdown_; std::unique_ptr<NetworkDropdown> dropdown_;
......
...@@ -190,7 +190,6 @@ void NetworkScreenHandler::DeclareLocalizedValues( ...@@ -190,7 +190,6 @@ void NetworkScreenHandler::DeclareLocalizedValues(
builder->Add("keyboardDropdownLabel", IDS_KEYBOARD_DROPDOWN_LABEL); builder->Add("keyboardDropdownLabel", IDS_KEYBOARD_DROPDOWN_LABEL);
builder->Add("proxySettingsMenuName", IDS_PROXY_SETTINGS_MENU_NAME); builder->Add("proxySettingsMenuName", IDS_PROXY_SETTINGS_MENU_NAME);
builder->Add("addWiFiNetworkMenuName", IDS_ADD_WI_FI_NETWORK_MENU_NAME); builder->Add("addWiFiNetworkMenuName", IDS_ADD_WI_FI_NETWORK_MENU_NAME);
builder->Add("addMobileNetworkMenuName", IDS_ADD_MOBILE_NETWORK_MENU_NAME);
builder->Add("highContrastOptionOff", IDS_HIGH_CONTRAST_OPTION_OFF); builder->Add("highContrastOptionOff", IDS_HIGH_CONTRAST_OPTION_OFF);
builder->Add("highContrastOptionOn", IDS_HIGH_CONTRAST_OPTION_ON); builder->Add("highContrastOptionOn", IDS_HIGH_CONTRAST_OPTION_ON);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment