0

Indicate in network menu if command is for activating a cellular network.

BUG=120342
TEST=


Review URL: http://codereview.chromium.org/9860031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129228 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
kevers@chromium.org
2012-03-27 18:36:22 +00:00
parent e72feebc70
commit 115277033e
2 changed files with 7 additions and 1 deletions
chrome/browser
resources
options2
ui
webui

@@ -586,9 +586,14 @@ cr.define('options.network', function() {
*/ */
createConnectCallback_: function(menu, data, opt_connect) { createConnectCallback_: function(menu, data, opt_connect) {
var cmd = opt_connect ? opt_connect : 'connect'; var cmd = opt_connect ? opt_connect : 'connect';
var label = data.networkName;
if (cmd == 'activate') {
label = localStrings.getString('activateNetwork');
label = label.replace('$1', data.networkName);
}
var menuItem = this.createCallback_(menu, var menuItem = this.createCallback_(menu,
data, data,
data.networkName, label,
cmd); cmd);
menuItem.style.backgroundImage = url(data.iconURL); menuItem.style.backgroundImage = url(data.iconURL);

@@ -302,6 +302,7 @@ void InternetOptionsHandler::GetLocalizedValues(
{ "disableDataRoaming", IDS_OPTIONS_SETTINGS_DISABLE_DATA_ROAMING }, { "disableDataRoaming", IDS_OPTIONS_SETTINGS_DISABLE_DATA_ROAMING },
{ "dataRoamingDisableToggleTooltip", { "dataRoamingDisableToggleTooltip",
IDS_OPTIONS_SETTINGS_TOGGLE_DATA_ROAMING_RESTRICTION }, IDS_OPTIONS_SETTINGS_TOGGLE_DATA_ROAMING_RESTRICTION },
{ "activateNetwork", IDS_STATUSBAR_NETWORK_DEVICE_ACTIVATE },
// Network options dialog labels. // Network options dialog labels.
// TODO(kevers): Remove once dialog is deprecated. // TODO(kevers): Remove once dialog is deprecated.