summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-08 21:17:39 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-08 21:17:39 +0000
commitffb1da2cf0cf595fdd4c13c14ba4f54b4761a66d (patch)
tree6be9d6738e949a094dd668bf2b38bc1839cfd3e1 /ash
parentbca9c3546a57777b4a598ad660b36f44d36c2c2e (diff)
downloadchromium_src-ffb1da2cf0cf595fdd4c13c14ba4f54b4761a66d.zip
chromium_src-ffb1da2cf0cf595fdd4c13c14ba4f54b4761a66d.tar.gz
chromium_src-ffb1da2cf0cf595fdd4c13c14ba4f54b4761a66d.tar.bz2
Show 'VPN is not configured' correctly
BUG=178818 Review URL: https://codereview.chromium.org/13648009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/system/chromeos/network/network_state_list_detailed_view.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc
index b71c40c..4eb231b 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc
@@ -613,7 +613,11 @@ bool NetworkStateListDetailedView::UpdateNetworkListEntries(
// No networks or other messages (fallback)
if (index == 0) {
- string16 text = rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_NO_NETWORKS);
+ string16 text;
+ if (list_type_ == LIST_TYPE_VPN)
+ text = rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_NETWORK_NO_VPN);
+ else
+ text = rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_NO_NETWORKS);
if (CreateOrUpdateInfoLabel(index++, text, &scanning_view_))
needs_relayout = true;
}