Skip to content

GitLab

T
tangled
Commit caba515e authored by Kyle Horimoto's avatar Kyle Horimoto Committed by Commit Bot
Browse files
Options

[CrOS MultiDevice] Remove UiMode in favor of MultiDeviceSetupDelegate. 

Before this CL, the <multidevice-setup> element was told what "UI mode"
(i.e., OOBE vs. post-OOBE) and behaved differently depending on what
mode was active. This abstraction was leaky, since it caused the element
to change its logic based on what its client at a higher level was.

This CL adds a MultiDeviceSetupDelegate interface and injects this
interface into the <multidevice-setup> element, which uses it to perform
tasks such as setting the host device. One concrete implementation of
this interface is provided for the post-OOBE case; a future CL will add
an implementation for OOBE.

This CL also removes multidevice_setup_dialog.js in favor of adding a
new <multidevice-setup-post-oobe> element.

Bug: 884058
Change-Id: I76b6553928e706da4870339d306bc32bea7ac3e6
Reviewed-on: https://chromium-review.googlesource.com/1247525Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarRyan Hansberry <hansberry@chromium.org>
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595258}
parent ef5f45ae
Hide whitespace changes
Inline Side-by-side
Showing with 302 additions and 118 deletions
chrome/browser/resources/chromeos/multidevice_setup/BUILD.gn
View file @ caba515e
...@@ -6,14 +6,34 @@ import("//third_party/closure_compiler/compile_js.gni") ...@@ -6,14 +6,34 @@ import("//third_party/closure_compiler/compile_js.gni")
js_type_check("closure_compile") { js_type_check("closure_compile") {
deps = [ deps = [
":multidevice_setup_dialog", ":multidevice_setup_post_oobe",
":post_oobe_delegate",
] ]
} }
js_library("multidevice_setup_dialog") { js_library("multidevice_setup_post_oobe") {
deps = [ deps = [
"//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup", ":post_oobe_delegate",
"//ui/webui/resources/cr_components/chromeos/multidevice_setup:ui_mode", ]
"//ui/webui/resources/js:util", }
js_library("post_oobe_delegate") {
deps = [
"//ui/webui/resources/cr_components/chromeos/multidevice_setup:mojo_api",
"//ui/webui/resources/cr_components/chromeos/multidevice_setup:multidevice_setup_delegate",
"//ui/webui/resources/js:cr",
]
extra_deps = [
"//chromeos/services/device_sync/public/mojom:mojom_js",
"//chromeos/services/multidevice_setup/public/mojom:mojom_js",
"//mojo/public/mojom/base:base_js",
]
externs_list = [
"$root_gen_dir/chromeos/services/device_sync/public/mojom/device_sync.mojom.externs.js",
"$root_gen_dir/chromeos/services/multidevice_setup/public/mojom/multidevice_setup.mojom.externs.js",
"$root_gen_dir/mojo/public/mojom/base/time.mojom.externs.js",
"$externs_path/mojo.js",
] ]
} }
chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_dialog.html
View file @ caba515e
...@@ -16,13 +16,11 @@ ...@@ -16,13 +16,11 @@
</style> </style>
</head> </head>
<body> <body>
<multidevice-setup id="main-element"></multidevice-setup>
<link rel="stylesheet" href="chrome://resources/css/md_colors.css"> <link rel="stylesheet" href="chrome://resources/css/md_colors.css">
<link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css"> <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
<link rel="import" href="chrome://resources/html/util.html"> <link rel="import" href="chrome://resources/html/util.html">
<link rel="import" href="i18n_setup.html"> <link rel="import" href="i18n_setup.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html"> <link rel="import" href="multidevice_setup_post_oobe.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/ui_mode.html"> <multidevice-setup-post-oobe id="main-element"></multidevice-setup-post-oobe>
</body> </body>
<script src="multidevice_setup_dialog.js"></script>
</html> </html>
chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_dialog.js deleted 100644 → 0
View file @ ef5f45ae
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
function closeUi() {
console.log('Closing Unified MultiDevice Setup WebUI');
chrome.send('dialogClose');
}
$('main-element').uiMode = multidevice_setup.UiMode.POST_OOBE;
$('main-element').addEventListener('setup-exited', () => closeUi());
chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_post_oobe.html 0 → 100644
View file @ caba515e
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html">
<link rel="import" href="post_oobe_delegate.html">
<dom-module id="multidevice-setup-post-oobe">
<template>
<style include="multidevice-setup-shared"></style>
<multidevice-setup delegate="[[delegate_]]"
on-setup-exited="onExitRequested_">
</multidevice-setup>
</template>
<script src="multidevice_setup_post_oobe.js">
</script>
</dom-module>
chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_post_oobe.js 0 → 100644
View file @ caba515e
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
/**
* MultiDevice setup flow which is shown after OOBE has completed.
*/
Polymer({
is: 'multidevice-setup-post-oobe',
properties: {
/** @private {!multidevice_setup.MultiDeviceSetupDelegate} */
delegate_: Object,
},
/** @override */
attached: function() {
this.delegate_ = new multidevice_setup.PostOobeDelegate();
},
/** @private */
onExitRequested_: function() {
chrome.send('dialogClose');
},
});
chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd
View file @ caba515e
...@@ -20,8 +20,17 @@ ...@@ -20,8 +20,17 @@
flattenhtml="true" flattenhtml="true"
allowexternalscript="true" allowexternalscript="true"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_DIALOG_JS" <structure name="IDR_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_POST_OOBE_HTML"
file="multidevice_setup_dialog.js" file="multidevice_setup_post_oobe.html"
type="chrome_html" />
<structure name="IDR_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_POST_OOBE_JS"
file="multidevice_setup_post_oobe.js"
type="chrome_html" />
<structure name="IDR_MULTIDEVICE_SETUP_POST_OOBE_DELEGATE_HTML"
file="post_oobe_delegate.html"
type="chrome_html" />
<structure name="IDR_MULTIDEVICE_SETUP_POST_OOBE_DELEGATE_JS"
file="post_oobe_delegate.js"
type="chrome_html" /> type="chrome_html" />
</structures> </structures>
</release> </release>
......
chrome/browser/resources/chromeos/multidevice_setup/post_oobe_delegate.html 0 → 100644
View file @ caba515e
<link rel="import" href="chrome://resources/html/cr.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/mojo_api.html">
<script src="post_oobe_delegate.js"></script>
chrome/browser/resources/chromeos/multidevice_setup/post_oobe_delegate.js 0 → 100644
View file @ caba515e
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
cr.define('multidevice_setup', function() {
/** @implements {multidevice_setup.MultiDeviceSetupDelegate} */
class PostOobeDelegate {
/** @override */
isPasswordRequiredToSetHost() {
return true;
}
/** @override */
setHostDevice(hostDeviceId, opt_authToken) {
// An authentication token is required to set the host device post-OOBE.
assert(!!opt_authToken);
// Note: A cast is needed here because currently all Mojo functions which
// return a promise are typed only as {Promise}. The setHostDevice()
// function always returns a {!Promise<{success: boolean}>} (see
// multidevice_setup.mojom).
return /** @type {!Promise<{success: boolean}>} */ (
multidevice_setup.MojoInterfaceProviderImpl.getInstance()
.getInterfacePtr()
.setHostDevice(hostDeviceId, opt_authToken));
}
/** @override */
shouldExitSetupFlowAfterSettingHost() {
return false;
}
}
return {
PostOobeDelegate: PostOobeDelegate,
};
});
chrome/test/data/webui/multidevice_setup/integration_test.js
View file @ caba515e
...@@ -4,6 +4,47 @@ ...@@ -4,6 +4,47 @@
/** @fileoverview Suite of integration tests for MultiDevice setup WebUI. */ /** @fileoverview Suite of integration tests for MultiDevice setup WebUI. */
cr.define('multidevice_setup', () => { cr.define('multidevice_setup', () => {
/** @implements {multidevice_setup.MultiDeviceSetupDelegate} */
class FakeDelegate {
constructor() {
/** @private {boolean} */
this.isPasswordRequiredToSetHost_ = true;
/** @private {boolean} */
this.shouldSetHostSucceed_ = true;
}
set isPasswordRequired(isPasswordRequired) {
this.isPasswordRequiredToSetHost_ = isPasswordRequired;
}
/** @override */
isPasswordRequiredToSetHost() {
return this.isPasswordRequiredToSetHost_;
}
set shouldSetHostSucceed(shouldSetHostSucceed) {
this.shouldSetHostSucceed_ = shouldSetHostSucceed;
}
/** @override */
setHostDevice(hostDeviceId, opt_authToken) {
return new Promise((resolve) => {
resolve({success: this.shouldSetHostSucceed_});
});
}
set shouldExitSetupFlowAfterHostSet(shouldExitSetupFlowAfterHostSet) {
this.shouldExitSetupFlowAfterSettingHost_ =
shouldExitSetupFlowAfterHostSet;
}
/** @override */
shouldExitSetupFlowAfterSettingHost() {
return this.shouldExitSetupFlowAfterSettingHost_;
}
}
function registerIntegrationTests() { function registerIntegrationTests() {
suite('MultiDeviceSetup', () => { suite('MultiDeviceSetup', () => {
/** /**
...@@ -30,8 +71,8 @@ cr.define('multidevice_setup', () => { ...@@ -30,8 +71,8 @@ cr.define('multidevice_setup', () => {
setup(() => { setup(() => {
multiDeviceSetupElement = document.createElement('multidevice-setup'); multiDeviceSetupElement = document.createElement('multidevice-setup');
multiDeviceSetupElement.delegate = new FakeDelegate();
multiDeviceSetupElement.multideviceSetup_ = new FakeMojoService(); multiDeviceSetupElement.multideviceSetup_ = new FakeMojoService();
multiDeviceSetupElement.uiMode = multidevice_setup.UiMode.POST_OOBE;
document.body.appendChild(multiDeviceSetupElement); document.body.appendChild(multiDeviceSetupElement);
forwardButton = multiDeviceSetupElement.$$('button-bar').$$('#forward'); forwardButton = multiDeviceSetupElement.$$('button-bar').$$('#forward');
...@@ -39,6 +80,13 @@ cr.define('multidevice_setup', () => { ...@@ -39,6 +80,13 @@ cr.define('multidevice_setup', () => {
multiDeviceSetupElement.$$('button-bar').$$('#backward'); multiDeviceSetupElement.$$('button-bar').$$('#backward');
}); });
/** @param {boolean} isOobeMode */
function setMode(isOobeMode) {
multiDeviceSetupElement.delegate.isPasswordRequired = !isOobeMode;
multiDeviceSetupElement.delegate.shouldExitSetupFlowAfterHostSet =
isOobeMode;
}
/** @param {string} visiblePageName */ /** @param {string} visiblePageName */
function setVisiblePage(visiblePageName) { function setVisiblePage(visiblePageName) {
multiDeviceSetupElement.visiblePageName_ = visiblePageName; multiDeviceSetupElement.visiblePageName_ = visiblePageName;
...@@ -65,9 +113,9 @@ cr.define('multidevice_setup', () => { ...@@ -65,9 +113,9 @@ cr.define('multidevice_setup', () => {
done(); done();
}); });
setMode(true /* isOobeMode */);
setVisiblePage(START); setVisiblePage(START);
multiDeviceSetupElement.multideviceSetup_.shouldSetHostSucceed = true; multiDeviceSetupElement.delegate.shouldSetHostSucceed = true;
multiDeviceSetupElement.uiMode = multidevice_setup.UiMode.OOBE;
backwardButton.click(); backwardButton.click();
}); });
...@@ -76,16 +124,13 @@ cr.define('multidevice_setup', () => { ...@@ -76,16 +124,13 @@ cr.define('multidevice_setup', () => {
'StartSetupPage forward button sets host in background and ' + 'StartSetupPage forward button sets host in background and ' +
'goes to PasswordPage (OOBE).', 'goes to PasswordPage (OOBE).',
done => { done => {
multiDeviceSetupElement.addEventListener( multiDeviceSetupElement.addEventListener('setup-exited', () => {
'visible-page-name_-changed', () => { done();
if (multiDeviceSetupElement.visiblePageName_ == PASSWORD) });
done();
});
setMode(true /* isOobeMode */);
setVisiblePage(START); setVisiblePage(START);
multiDeviceSetupElement.multideviceSetup_.shouldSetHostSucceed = multiDeviceSetupElement.delegate.shouldSetHostSucceed = true;
true;
multiDeviceSetupElement.uiMode = multidevice_setup.UiMode.OOBE;
multiDeviceSetupElement.async(() => { multiDeviceSetupElement.async(() => {
forwardButton.click(); forwardButton.click();
...@@ -97,9 +142,9 @@ cr.define('multidevice_setup', () => { ...@@ -97,9 +142,9 @@ cr.define('multidevice_setup', () => {
test('StartSetupPage backward button closes UI (post-OOBE)', done => { test('StartSetupPage backward button closes UI (post-OOBE)', done => {
multiDeviceSetupElement.addEventListener('setup-exited', () => done()); multiDeviceSetupElement.addEventListener('setup-exited', () => done());
setMode(false /* isOobeMode */);
setVisiblePage(START); setVisiblePage(START);
multiDeviceSetupElement.multideviceSetup_.shouldSetHostSucceed = true; multiDeviceSetupElement.delegate.shouldSetHostSucceed = true;
multiDeviceSetupElement.uiMode = multidevice_setup.UiMode.POST_OOBE;
backwardButton.click(); backwardButton.click();
}); });
...@@ -107,9 +152,9 @@ cr.define('multidevice_setup', () => { ...@@ -107,9 +152,9 @@ cr.define('multidevice_setup', () => {
test('PasswordPage backward button closes UI (post-OOBE)', done => { test('PasswordPage backward button closes UI (post-OOBE)', done => {
multiDeviceSetupElement.addEventListener('setup-exited', () => done()); multiDeviceSetupElement.addEventListener('setup-exited', () => done());
setMode(false /* isOobeMode */);
setVisiblePage(PASSWORD); setVisiblePage(PASSWORD);
multiDeviceSetupElement.multideviceSetup_.shouldSetHostSucceed = true; multiDeviceSetupElement.delegate.shouldSetHostSucceed = true;
multiDeviceSetupElement.uiMode = multidevice_setup.UiMode.POST_OOBE;
backwardButton.click(); backwardButton.click();
}); });
...@@ -124,10 +169,9 @@ cr.define('multidevice_setup', () => { ...@@ -124,10 +169,9 @@ cr.define('multidevice_setup', () => {
done(); done();
}); });
setMode(false /* isOobeMode */);
setVisiblePage(PASSWORD); setVisiblePage(PASSWORD);
multiDeviceSetupElement.multideviceSetup_.shouldSetHostSucceed = multiDeviceSetupElement.delegate.shouldSetHostSucceed = true;
true;
multiDeviceSetupElement.uiMode = multidevice_setup.UiMode.POST_OOBE;
multiDeviceSetupElement.async(() => { multiDeviceSetupElement.async(() => {
forwardButton.click(); forwardButton.click();
......
ui/webui/resources/cr_components/chromeos/multidevice_setup/BUILD.gn
View file @ caba515e
...@@ -13,20 +13,14 @@ js_type_check("closure_compile") { ...@@ -13,20 +13,14 @@ js_type_check("closure_compile") {
":mojo_api", ":mojo_api",
":multidevice_setup", ":multidevice_setup",
":multidevice_setup_browser_proxy", ":multidevice_setup_browser_proxy",
":multidevice_setup_delegate",
":setup_failed_page", ":setup_failed_page",
":setup_succeeded_page", ":setup_succeeded_page",
":start_setup_page", ":start_setup_page",
":ui_mode",
":ui_page_container_behavior", ":ui_page_container_behavior",
] ]
} }
js_library("multidevice_setup_browser_proxy") {
deps = [
"//ui/webui/resources/js:cr",
]
}
js_library("button_bar") { js_library("button_bar") {
} }
...@@ -50,6 +44,9 @@ js_library("fake_mojo_service") { ...@@ -50,6 +44,9 @@ js_library("fake_mojo_service") {
} }
js_library("mojo_api") { js_library("mojo_api") {
deps = [
"//ui/webui/resources/js:cr",
]
} }
js_library("multidevice_setup") { js_library("multidevice_setup") {
...@@ -57,11 +54,11 @@ js_library("multidevice_setup") { ...@@ -57,11 +54,11 @@ js_library("multidevice_setup") {
":button_bar", ":button_bar",
":fake_mojo_service", ":fake_mojo_service",
":mojo_api", ":mojo_api",
":multidevice_setup_delegate",
":password_page", ":password_page",
":setup_failed_page", ":setup_failed_page",
":setup_succeeded_page", ":setup_succeeded_page",
":start_setup_page", ":start_setup_page",
":ui_mode",
"//ui/webui/resources/js:cr", "//ui/webui/resources/js:cr",
] ]
...@@ -79,6 +76,18 @@ js_library("multidevice_setup") { ...@@ -79,6 +76,18 @@ js_library("multidevice_setup") {
] ]
} }
js_library("multidevice_setup_browser_proxy") {
deps = [
"//ui/webui/resources/js:cr",
]
}
js_library("multidevice_setup_delegate") {
deps = [
"//ui/webui/resources/js:cr",
]
}
js_library("password_page") { js_library("password_page") {
deps = [ deps = [
":multidevice_setup_browser_proxy", ":multidevice_setup_browser_proxy",
...@@ -109,12 +118,6 @@ js_library("start_setup_page") { ...@@ -109,12 +118,6 @@ js_library("start_setup_page") {
] ]
} }
js_library("ui_mode") {
deps = [
"//ui/webui/resources/js:cr",
]
}
js_library("ui_page_container_behavior") { js_library("ui_page_container_behavior") {
deps = [ deps = [
"//ui/webui/resources/js:cr", "//ui/webui/resources/js:cr",
......
ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html
View file @ caba515e
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/button_bar.html"> <link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/button_bar.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/fake_mojo_service.html"> <link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/fake_mojo_service.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/mojo_api.html"> <link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/mojo_api.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html"> <link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/password_page.html"> <link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/password_page.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/setup_failed_page.html"> <link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/setup_failed_page.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.html"> <link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/start_setup_page.html"> <link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/start_setup_page.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/multidevice_setup/ui_mode.html">
<link rel="import" href="chrome://resources/html/cr.html"> <link rel="import" href="chrome://resources/html/cr.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.html">
...@@ -35,14 +35,19 @@ ...@@ -35,14 +35,19 @@
<iron-pages attr-for-selected="is" <iron-pages attr-for-selected="is"
selected="[[visiblePageName_]]" selected="[[visiblePageName_]]"
selected-item="{{visiblePage_}}"> selected-item="{{visiblePage_}}">
<password-page id="passwordPage" <template is="dom-if" if="[[shouldPasswordPageBeIncluded_(delegate)]]"
auth-token="{{authToken_}}" restamp>
forward-button-disabled="{{passwordPageForwardButtonDisabled_}}" <password-page auth-token="{{authToken_}}"
password-field-valid="{{passwordFieldValid}}" forward-button-disabled="{{passwordPageForwardButtonDisabled_}}"
on-user-submitted-password="onUserSubmittedPassword_"> password-field-valid="{{passwordFieldValid}}"
</password-page> on-user-submitted-password="onUserSubmittedPassword_">
</password-page>
</template>
<setup-failed-page></setup-failed-page> <setup-failed-page></setup-failed-page>
<setup-succeeded-page></setup-succeeded-page> <template is="dom-if"
if="[[shouldSetupSucceededPageBeIncluded_(delegate)]]" restamp>
<setup-succeeded-page></setup-succeeded-page>
</template>
<start-setup-page devices="[[devices_]]" <start-setup-page devices="[[devices_]]"
selected-device-id="{{selectedDeviceId_}}"> selected-device-id="{{selectedDeviceId_}}">
</start-setup-page> </start-setup-page>
......
ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.js
View file @ caba515e
...@@ -20,11 +20,10 @@ cr.define('multidevice_setup', function() { ...@@ -20,11 +20,10 @@ cr.define('multidevice_setup', function() {
properties: { properties: {
/** /**
* Indicates whether UI was opened during OOBE flow or afterward. * Delegate object which performs differently in OOBE vs. non-OOBE mode.
* * @type {!multidevice_setup.MultiDeviceSetupDelegate}
* @type {!multidevice_setup.UiMode}
*/ */
uiMode: Number, delegate: Object,
/** /**
* Element name of the currently visible page. * Element name of the currently visible page.
...@@ -34,8 +33,7 @@ cr.define('multidevice_setup', function() { ...@@ -34,8 +33,7 @@ cr.define('multidevice_setup', function() {
visiblePageName_: { visiblePageName_: {
type: String, type: String,
value: PageName.START, value: PageName.START,
// For testing purporses only notify: true, // For testing purporses only.
notify: true,
}, },
/** /**
...@@ -145,39 +143,46 @@ cr.define('multidevice_setup', function() { ...@@ -145,39 +143,46 @@ cr.define('multidevice_setup', function() {
this.visiblePageName_ = PageName.START; this.visiblePageName_ = PageName.START;
return; return;
case PageName.PASSWORD: case PageName.PASSWORD:
this.$.passwordPage.clearPasswordTextInput(); this.$$('password-page').clearPasswordTextInput();
let deviceId = /** @type {string} */ (this.selectedDeviceId_); this.setHostDevice_();
this.multideviceSetup_.setHostDevice(deviceId, this.authToken_)
.then((responseParams) => {
if (!responseParams.success) {
console.warn(
'Failure setting device with device ID: ' +
this.selectedDeviceId_);
return;
}
switch (this.uiMode) {
case multidevice_setup.UiMode.OOBE:
this.exitSetupFlow_();
return;
case multidevice_setup.UiMode.POST_OOBE:
this.visiblePageName_ = PageName.SUCCESS;
return;
}
})
.catch((error) => {
console.warn('Mojo service failure: ' + error);
});
return; return;
case PageName.SUCCESS: case PageName.SUCCESS:
this.exitSetupFlow_(); this.exitSetupFlow_();
return; return;
case PageName.START: case PageName.START:
this.visiblePageName_ = PageName.PASSWORD; if (this.delegate.isPasswordRequiredToSetHost())
this.visiblePageName_ = PageName.PASSWORD;
else
this.setHostDevice_();
return; return;
} }
}, },
/** @private */
setHostDevice_: function() {
// An authentication token must be set if a password is required.
assert(this.delegate.isPasswordRequiredToSetHost() == !!this.authToken_);
let deviceId = /** @type {string} */ (this.selectedDeviceId_);
this.delegate.setHostDevice(deviceId, this.authToken_)
.then((responseParams) => {
if (!responseParams.success) {
console.warn('Failure setting host with device ID: ' + deviceId);
return;
}
if (this.delegate.shouldExitSetupFlowAfterSettingHost()) {
this.exitSetupFlow_();
return;
}
this.visiblePageName_ = PageName.SUCCESS;
})
.catch((error) => {
console.warn('Mojo service failure: ' + error);
});
},
/** @private */ /** @private */
onUserSubmittedPassword_: function() { onUserSubmittedPassword_: function() {
this.onForwardNavigationRequested_(); this.onForwardNavigationRequested_();
...@@ -192,13 +197,28 @@ cr.define('multidevice_setup', function() { ...@@ -192,13 +197,28 @@ cr.define('multidevice_setup', function() {
this.passwordPageForwardButtonDisabled_; this.passwordPageForwardButtonDisabled_;
}, },
/**
* @return {boolean}
* @private
*/
shouldPasswordPageBeIncluded_: function() {
return this.delegate.isPasswordRequiredToSetHost();
},
/**
* @return {boolean}
* @private
*/
shouldSetupSucceededPageBeIncluded_: function() {
return !this.delegate.shouldExitSetupFlowAfterSettingHost();
},
/** /**
* Notifies observers that the setup flow has completed. * Notifies observers that the setup flow has completed.
* *
* @private * @private
*/ */
exitSetupFlow_: function() { exitSetupFlow_: function() {
console.log('Exiting Setup Flow');
this.fire('setup-exited'); this.fire('setup-exited');
}, },
}); });
......
ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_mode.html → ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.html
View file @ caba515e
<link rel="import" href="chrome://resources/html/cr.html"> <link rel="import" href="chrome://resources/html/cr.html">
<script src="chrome://resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.js">
<script src="chrome://resources/cr_components/chromeos/multidevice_setup/ui_mode.js">
</script> </script>
ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.js 0 → 100644
View file @ caba515e
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
cr.define('multidevice_setup', function() {
/**
* Interface which provides the ability to set the host device and perform
* related logic.
* @interface
*/
class MultiDeviceSetupDelegate {
/** @return {boolean} */
isPasswordRequiredToSetHost() {}
/**
* @param {string} hostDeviceId The ID of the host to set.
* @param {string=} opt_authToken An auth token to authenticate the request;
* only necessary if isPasswordRequiredToSetHost() returns true.
* @return {!Promise<{success: boolean}>}
*/
setHostDevice(hostDeviceId, opt_authToken) {}
/** @return {boolean} */
shouldExitSetupFlowAfterSettingHost() {}
}
return {
MultiDeviceSetupDelegate: MultiDeviceSetupDelegate,
};
});
ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_mode.js deleted 100644 → 0
View file @ ef5f45ae
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
cr.define('multidevice_setup', function() {
/** @enum {number} */
const UiMode = {
OOBE: 1,
POST_OOBE: 2,
};
return {
UiMode: UiMode,
};
});
ui/webui/resources/cr_components/cr_components_resources.grdp
View file @ caba515e
...@@ -280,6 +280,14 @@ ...@@ -280,6 +280,14 @@
file="cr_components/chromeos/multidevice_setup/multidevice_setup.js" file="cr_components/chromeos/multidevice_setup/multidevice_setup.js"
type="chrome_html" type="chrome_html"
compress="gzip" /> compress="gzip" />
<structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_DELEGATE_HTML"
file="cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.html"
type="chrome_html"
compress="gzip" />
<structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_DELEGATE_JS"
file="cr_components/chromeos/multidevice_setup/multidevice_setup_delegate.js"
type="chrome_html"
compress="gzip" />
<structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_SHARED_CSS_HTML" <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_SHARED_CSS_HTML"
file="cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html" file="cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html"
type="chrome_html" type="chrome_html"
...@@ -316,14 +324,6 @@ ...@@ -316,14 +324,6 @@
file="cr_components/chromeos/multidevice_setup/start_setup_page.js" file="cr_components/chromeos/multidevice_setup/start_setup_page.js"
type="chrome_html" type="chrome_html"
compress="gzip" /> compress="gzip" />
<structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_UI_MODE_HTML"
file="cr_components/chromeos/multidevice_setup/ui_mode.html"
type="chrome_html"
compress="gzip" />
<structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_UI_MODE_JS"
file="cr_components/chromeos/multidevice_setup/ui_mode.js"
type="chrome_html"
compress="gzip" />
<structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_UI_PAGE_CONTAINER_BEHAVIOR_HTML" <structure name="IDR_WEBUI_CHROMEOS_MULTIDEVICE_SETUP_UI_PAGE_CONTAINER_BEHAVIOR_HTML"
file="cr_components/chromeos/multidevice_setup/ui_page_container_behavior.html" file="cr_components/chromeos/multidevice_setup/ui_page_container_behavior.html"
type="chrome_html" type="chrome_html"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment