diff options
Diffstat (limited to 'chromium/chrome/browser/resources/settings/multidevice_page')
4 files changed, 13 insertions, 13 deletions
diff --git a/chromium/chrome/browser/resources/settings/multidevice_page/BUILD.gn b/chromium/chrome/browser/resources/settings/multidevice_page/BUILD.gn index 7818234969e..a35e2871de8 100644 --- a/chromium/chrome/browser/resources/settings/multidevice_page/BUILD.gn +++ b/chromium/chrome/browser/resources/settings/multidevice_page/BUILD.gn @@ -109,7 +109,6 @@ if (is_chromeos) { ":multidevice_feature_behavior", "..:route", "//ui/webui/resources/cr_elements/chromeos/network:cr_network_listener_behavior", - "//ui/webui/resources/cr_elements/chromeos/network:cr_onc_types", "//ui/webui/resources/js/chromeos:onc_mojo", ] externs_list = [ "$externs_path/networking_private.js" ] diff --git a/chromium/chrome/browser/resources/settings/multidevice_page/multidevice_subpage.html b/chromium/chrome/browser/resources/settings/multidevice_page/multidevice_subpage.html index 2e75dd98bd0..55a72bcb020 100644 --- a/chromium/chrome/browser/resources/settings/multidevice_page/multidevice_subpage.html +++ b/chromium/chrome/browser/resources/settings/multidevice_page/multidevice_subpage.html @@ -31,10 +31,6 @@ #feature-items-container { @apply --settings-list-frame-padding; } - - #forget-device-container { - border-top: var(--cr-separator-line); - } </style> <div class="settings-box first"> <div id="status-text-container" @@ -99,11 +95,17 @@ </template> </div> </template> - <div id="forget-device-container"> - <cr-link-row id="forget-device" class="hr" - on-click="handleForgetDeviceClick_" - label="$i18n{multideviceForgetDevice}" - sub-label="$i18n{multideviceForgetDeviceSummary}"></cr-link-row> + <div class="settings-box two-line"> + <div id="forget-device-label" class="start"> + $i18n{multideviceForgetDevice} + <div class="secondary"> + $i18n{multideviceForgetDeviceSummary} + </div> + </div> + <cr-button on-click="handleForgetDeviceClick_" + aria-labelledby="forgetDeviceLabel"> + $i18n{multideviceForgetDeviceDisconnect} + </cr-button> </div> <cr-dialog id="forgetDeviceDialog"> <div slot="title">$i18n{multideviceForgetDevice}</div> @@ -120,7 +122,7 @@ <cr-button id="confirmButton" class="action-button" on-click="onForgetDeviceDialogConfirmClick_"> - $i18n{confirm} + $i18n{multideviceForgetDeviceDisconnect} </cr-button> </div> </cr-dialog> diff --git a/chromium/chrome/browser/resources/settings/multidevice_page/multidevice_tether_item.html b/chromium/chrome/browser/resources/settings/multidevice_page/multidevice_tether_item.html index 326a4c50e00..4809023c3b1 100644 --- a/chromium/chrome/browser/resources/settings/multidevice_page/multidevice_tether_item.html +++ b/chromium/chrome/browser/resources/settings/multidevice_page/multidevice_tether_item.html @@ -1,6 +1,5 @@ <link rel="import" href="chrome://resources/html/polymer.html"> -<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_types.html"> <link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_network_icon.html"> <link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_network_listener_behavior.html"> <link rel="import" href="chrome://resources/html/chromeos/onc_mojo.html"> diff --git a/chromium/chrome/browser/resources/settings/multidevice_page/multidevice_tether_item.js b/chromium/chrome/browser/resources/settings/multidevice_page/multidevice_tether_item.js index fe69ece9bc2..d9ab5429c4c 100644 --- a/chromium/chrome/browser/resources/settings/multidevice_page/multidevice_tether_item.js +++ b/chromium/chrome/browser/resources/settings/multidevice_page/multidevice_tether_item.js @@ -165,6 +165,6 @@ Polymer({ * @private */ getTetherNetworkUrlSearchParams_: function() { - return new URLSearchParams('type=' + CrOnc.Type.TETHER); + return new URLSearchParams('type=Tether'); }, }); |