diff --git a/ash/webui/diagnostics_ui/diagnostics_ui.cc b/ash/webui/diagnostics_ui/diagnostics_ui.cc index 4a26e52a507432..ef09d8c5b7478b 100644 --- a/ash/webui/diagnostics_ui/diagnostics_ui.cc +++ b/ash/webui/diagnostics_ui/diagnostics_ui.cc @@ -165,6 +165,7 @@ void AddDiagnosticsStrings(content::WebUIDataSource* html_source) { IDS_NETWORK_DIAGNOSTICS_IP_CONFIG_INFO_DRAWER_SUBNET_MASK}, {"ipConfigInfoDrawerTitle", IDS_NETWORK_DIAGNOSTICS_IP_CONFIG_INFO_DRAWER_TITLE}, + {"joinNetworkLinkText", IDS_DIAGNOSTICS_JOIN_NETWORK_LINK_TEXT}, {"lanConnectivityFailedText", IDS_DIAGNOSTICS_LAN_CONNECTIVITY_FAILED_TEXT}, {"lanConnectivityGroupText", IDS_NETWORK_DIAGNOSTICS_CONNECTION_GROUP}, diff --git a/ash/webui/diagnostics_ui/resources/network_card.js b/ash/webui/diagnostics_ui/resources/network_card.js index 695c830d7f39d2..646640e51dd6c3 100644 --- a/ash/webui/diagnostics_ui/resources/network_card.js +++ b/ash/webui/diagnostics_ui/resources/network_card.js @@ -264,10 +264,13 @@ Polymer({ * @return {!TroubleshootingInfo} */ getDisabledTroubleshootingInfo_() { + const linkText = + this.network && this.network.type === NetworkType.kCellular ? + this.i18n('reconnectLinkText') : + this.i18n('joinNetworkLinkText', this.networkType_); return { - header: this.i18n('disabledText', this.networkType_), - linkText: this.i18n('reconnectLinkText'), - url: SETTINGS_URL, + header: this.i18n('disabledText', this.networkType_), linkText, + url: SETTINGS_URL, } }, diff --git a/chrome/test/data/webui/chromeos/diagnostics/network_card_test.js b/chrome/test/data/webui/chromeos/diagnostics/network_card_test.js index 09857604015f4f..0ee0b155639bb8 100644 --- a/chrome/test/data/webui/chromeos/diagnostics/network_card_test.js +++ b/chrome/test/data/webui/chromeos/diagnostics/network_card_test.js @@ -4,7 +4,7 @@ import 'chrome://diagnostics/network_card.js'; -import {fakeCellularNetwork, fakeCellularWithIpConfigNetwork, fakeConnectingEthernetNetwork, fakeDisconnectedEthernetNetwork, fakeDisconnectedWifiNetwork, fakeEthernetNetwork, fakeNetworkGuidInfoList, fakePortalWifiNetwork, fakeWifiNetwork, fakeWifiNetworkDisabled, fakeWifiNetworkInvalidNameServers, fakeWifiNetworkNoIpAddress} from 'chrome://diagnostics/fake_data.js'; +import {fakeCellularDisabledNetwork, fakeCellularNetwork, fakeCellularWithIpConfigNetwork, fakeConnectingEthernetNetwork, fakeDisconnectedEthernetNetwork, fakeDisconnectedWifiNetwork, fakeEthernetNetwork, fakeNetworkGuidInfoList, fakePortalWifiNetwork, fakeWifiNetwork, fakeWifiNetworkDisabled, fakeWifiNetworkInvalidNameServers, fakeWifiNetworkNoIpAddress} from 'chrome://diagnostics/fake_data.js'; import {FakeNetworkHealthProvider} from 'chrome://diagnostics/fake_network_health_provider.js'; import {setNetworkHealthProviderForTesting} from 'chrome://diagnostics/mojo_interface_provider.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; @@ -60,6 +60,8 @@ export function networkCardTestSuite() { 'wifiGuidNoIpAddress', [fakeWifiNetworkNoIpAddress]); provider.setFakeNetworkState( 'cellularWithIpConfigGuid', [fakeCellularWithIpConfigNetwork]); + provider.setFakeNetworkState( + 'cellularDisabledGuid', [fakeCellularDisabledNetwork]); // Add the network info to the DOM. networkCardElement = /** @type {!NetworkCardElement} */ ( document.createElement('network-card')); @@ -195,6 +197,9 @@ export function networkCardTestSuite() { assertTrue(isVisible(getTroubleConnectingElement())); assertFalse(isVisible(getNetworkInfoElement())); assertFalse(isVisible(getIpConfigDrawerElement())); + assertEquals( + networkCardElement.i18n('joinNetworkLinkText', 'Wi-Fi'), + getTroubleshootingLinkText()); }); }); @@ -331,4 +336,17 @@ export function networkCardTestSuite() { assertTrue(isVisible(getIpConfigDrawerElement())); }); }); + + test('CardTitleCellularDisabledInitializedCorrectly', () => { + return initializeNetworkCard('cellularDisabledGuid').then(() => { + dx_utils.assertElementContainsText( + networkCardElement.$$('#cardTitle'), 'Mobile data'); + assertTrue(isVisible(getTroubleConnectingElement())); + assertFalse(isVisible(getNetworkInfoElement())); + assertFalse(isVisible(getIpConfigDrawerElement())); + assertEquals( + networkCardElement.i18n('reconnectLinkText'), + getTroubleshootingLinkText()); + }); + }); } diff --git a/chromeos/chromeos_strings.grd b/chromeos/chromeos_strings.grd index abd9bff6049157..219e2128045902 100644 --- a/chromeos/chromeos_strings.grd +++ b/chromeos/chromeos_strings.grd @@ -989,10 +989,13 @@ Try tapping the mic to ask me anything. other {Name servers}} - $1Wi-Fi has been disabled + $1Wi-Fi is off - Visit Settings to reconnect + To reconnect, go to Settings + + + To join a $1Wi-Fi network, go to Settings Mobile data diff --git a/chromeos/chromeos_strings_grd/IDS_DIAGNOSTICS_DISABLED_TEXT.png.sha1 b/chromeos/chromeos_strings_grd/IDS_DIAGNOSTICS_DISABLED_TEXT.png.sha1 index 4dd0ffb93e4a5e..be2eb72f7a420c 100644 --- a/chromeos/chromeos_strings_grd/IDS_DIAGNOSTICS_DISABLED_TEXT.png.sha1 +++ b/chromeos/chromeos_strings_grd/IDS_DIAGNOSTICS_DISABLED_TEXT.png.sha1 @@ -1 +1 @@ -6d094a435368dbce4b199b041be35540888b1779 \ No newline at end of file +d42029b5adb299a042b858d55999d0ca38c1c5af \ No newline at end of file diff --git a/chromeos/chromeos_strings_grd/IDS_DIAGNOSTICS_JOIN_NETWORK_LINK_TEXT.png.sha1 b/chromeos/chromeos_strings_grd/IDS_DIAGNOSTICS_JOIN_NETWORK_LINK_TEXT.png.sha1 new file mode 100644 index 00000000000000..077263d761b87a --- /dev/null +++ b/chromeos/chromeos_strings_grd/IDS_DIAGNOSTICS_JOIN_NETWORK_LINK_TEXT.png.sha1 @@ -0,0 +1 @@ +f0fd50ed46070f1183ef95461d25d5fa446704fe \ No newline at end of file diff --git a/chromeos/chromeos_strings_grd/IDS_DIAGNOSTICS_RECONNECT_LINK_TEXT.png.sha1 b/chromeos/chromeos_strings_grd/IDS_DIAGNOSTICS_RECONNECT_LINK_TEXT.png.sha1 index 4dd0ffb93e4a5e..a83c1386d9c6fa 100644 --- a/chromeos/chromeos_strings_grd/IDS_DIAGNOSTICS_RECONNECT_LINK_TEXT.png.sha1 +++ b/chromeos/chromeos_strings_grd/IDS_DIAGNOSTICS_RECONNECT_LINK_TEXT.png.sha1 @@ -1 +1 @@ -6d094a435368dbce4b199b041be35540888b1779 \ No newline at end of file +d31ac54b7437a0495c489bc3be3459cdfc7c2e75 \ No newline at end of file