Skip to content

Commit 13ded78

Browse files
nohleJeremy Klein
authored and
Jeremy Klein
committed
[CrOS MultiDevice] Change "Cancel" to "No thanks" in OOBE
On the start setup page of OOBE, change the text of the cancel button to read "No thanks" instead of "Cancel". Screenshots: OOBE: https://drive.google.com/open?id=1QjHg1_v1QFg1tph986Xi2igPUYG8nJlneA post-OOBE: https://drive.google.com/open?id=1-hxQjU-WVMi8sAWNAZB-7LyrcX3F5ju5bQ Bug: 893353 Change-Id: I748f282b392bccfe17bd14f8bc036cca786bb8f9 Tested: Manual; ./out/Default/browser_tests --gtest_filter=*MultiDevice* Reviewed-on: https://chromium-review.googlesource.com/c/1272067 Commit-Queue: Josh Nohle <[email protected]> Reviewed-by: Alexander Alekseev <[email protected]> Reviewed-by: Kyle Horimoto <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#599860}(cherry picked from commit 8c25763) Reviewed-on: https://chromium-review.googlesource.com/c/1286873 Reviewed-by: Jeremy Klein <[email protected]> Cr-Commit-Position: refs/branch-heads/3578@{#84} Cr-Branched-From: 4226ddf-refs/heads/master@{#599034}
1 parent 789d1f3 commit 13ded78

File tree

7 files changed

+37
-2
lines changed

7 files changed

+37
-2
lines changed

chrome/browser/resources/chromeos/login/multidevice_setup_first_run.js

+5
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ cr.define('multidevice_setup', function() {
4545
shouldExitSetupFlowAfterSettingHost() {
4646
return true;
4747
}
48+
49+
/** @override */
50+
getStartSetupCancelButtonTextId() {
51+
return 'noThanks';
52+
}
4853
}
4954

5055
const MultiDeviceSetupFirstRun = Polymer({

chrome/browser/resources/chromeos/multidevice_setup/post_oobe_delegate.js

+5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ cr.define('multidevice_setup', function() {
2929
shouldExitSetupFlowAfterSettingHost() {
3030
return false;
3131
}
32+
33+
/** @override */
34+
getStartSetupCancelButtonTextId() {
35+
return 'cancel';
36+
}
3237
}
3338

3439
return {

chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_localized_strings_provider.cc

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ constexpr struct {
4040
{"back", IDS_MULTIDEVICE_SETUP_BACK_LABEL},
4141
{"cancel", IDS_CANCEL},
4242
{"done", IDS_DONE},
43+
{"noThanks", IDS_NO_THANKS},
4344
{"passwordPageHeader", IDS_MULTIDEVICE_SETUP_PASSWORD_PAGE_HEADER},
4445
{"enterPassword", IDS_MULTIDEVICE_SETUP_PASSWORD_PAGE_ENTER_PASSWORD_LABEL},
4546
{"wrongPassword", IDS_MULTIDEVICE_SETUP_PASSWORD_PAGE_WRONG_PASSWORD_LABEL},

chrome/test/data/webui/multidevice_setup/integration_test.js

+5
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ cr.define('multidevice_setup', () => {
4646
shouldExitSetupFlowAfterSettingHost() {
4747
return this.shouldExitSetupFlowAfterSettingHost_;
4848
}
49+
50+
/** @override */
51+
getStartSetupCancelButtonTextId() {
52+
return 'cancel';
53+
}
4954
}
5055

5156
/** @implements {multidevice_setup.MojoInterfaceProvider} */

ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
<setup-succeeded-page></setup-succeeded-page>
5050
</template>
5151
<start-setup-page devices="[[devices_]]"
52-
selected-device-id="{{selectedDeviceId_}}">
52+
selected-device-id="{{selectedDeviceId_}}"
53+
delegate="[[delegate]]">
5354
</start-setup-page>
5455
</iron-pages>
5556
<div class="flex"></div>

ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.js

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ cr.define('multidevice_setup', function() {
2222

2323
/** @return {boolean} */
2424
shouldExitSetupFlowAfterSettingHost() {}
25+
26+
/** @return {string} */
27+
getStartSetupCancelButtonTextId() {}
2528
}
2629

2730
return {

ui/webui/resources/cr_components/chromeos/multidevice_setup/start_setup_page.js

+16-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Polymer({
1515
/** Overridden from UiPageContainerBehavior. */
1616
cancelButtonTextId: {
1717
type: String,
18-
value: 'cancel',
18+
computed: 'getCancelButtonTextId_(delegate)',
1919
},
2020

2121
/** Overridden from UiPageContainerBehavior. */
@@ -53,6 +53,12 @@ Polymer({
5353
type: String,
5454
notify: true,
5555
},
56+
57+
/**
58+
* Delegate object which performs differently in OOBE vs. non-OOBE mode.
59+
* @type {!multidevice_setup.MultiDeviceSetupDelegate}
60+
*/
61+
delegate: Object,
5662
},
5763

5864
behaviors: [
@@ -83,6 +89,15 @@ Polymer({
8389
}
8490
},
8591

92+
/**
93+
* @param {!multidevice_setup.MultiDeviceSetupDelegate} delegate
94+
* @return {string} The cancel button text ID, dependent on OOBE vs. non-OOBE.
95+
* @private
96+
*/
97+
getCancelButtonTextId_: function(delegate) {
98+
return this.delegate.getStartSetupCancelButtonTextId();
99+
},
100+
86101
/**
87102
* @param {!Array<!chromeos.deviceSync.mojom.RemoteDevice>} devices
88103
* @return {string} Label for devices selection content.

0 commit comments

Comments
 (0)