Commit d4f22170 authored by Jordy Greenblatt's avatar Jordy Greenblatt Committed by Commit Bot

[CrOS MultiDevice]: Remove SettingUpPage from WebUI.

Bug: 835388
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I85a4f50b315dc37769d762a2de2d6e5f15a33261
Reviewed-on: https://chromium-review.googlesource.com/1022390
Commit-Queue: Jordy Greenblatt <jordynass@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552498}
parent 7324e68e
...@@ -3,34 +3,27 @@ ...@@ -3,34 +3,27 @@
# found in the LICENSE file. # found in the LICENSE file.
{ {
'targets': [ 'targets': [
{
'target_name': 'button_navigation_behavior',
'dependencies': [],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{ {
'target_name': 'multidevice_setup', 'target_name': 'multidevice_setup',
'dependencies': [ 'dependencies': [
'<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr', '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
'<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior', '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
'button_navigation_behavior', 'button_navigation_behavior',
'start_setup_page',
'setting_up_page',
'setup_succeeded_page',
'setup_failed_page', 'setup_failed_page',
'setup_succeeded_page',
'start_setup_page',
], ],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'], 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
}, },
{ {
'target_name': 'button_navigation_behavior', 'target_name': 'setup_failed_page',
'dependencies': [],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
'target_name': 'start_setup_page',
'dependencies': ['button_navigation_behavior'],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
'target_name': 'setting_up_page',
'dependencies': ['button_navigation_behavior'], 'dependencies': ['button_navigation_behavior'],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'], 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
}, },
...@@ -42,7 +35,7 @@ ...@@ -42,7 +35,7 @@
}, },
{ {
'target_name': 'setup_failed_page', 'target_name': 'start_setup_page',
'dependencies': ['button_navigation_behavior'], 'dependencies': ['button_navigation_behavior'],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'], 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
}, },
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<template> <template>
<iron-pages id="pages" attr-for-selected="is" <iron-pages id="pages" attr-for-selected="is"
selected="[[visiblePageName_]]" selected-item="{{visiblePage_}}"> selected="[[visiblePageName_]]" selected-item="{{visiblePage_}}">
<setting-up-page></setting-up-page>
<setup-failed-page></setup-failed-page> <setup-failed-page></setup-failed-page>
<setup-succeeded-page></setup-succeeded-page> <setup-succeeded-page></setup-succeeded-page>
<start-setup-page></start-setup-page> <start-setup-page></start-setup-page>
......
...@@ -32,8 +32,8 @@ Polymer({ ...@@ -32,8 +32,8 @@ Polymer({
* DOM Element corresponding to the visible page. * DOM Element corresponding to the visible page.
* *
* @private * @private
* @type {!StartSetupPageElement|!SettingUpPageElement| * @type {!SetupFailedPageElement|!SetupSucceededPageElement|
* !SetupSucceededPageElement|!SetupFailedPageElement} * !StartSetupPageElement}
*/ */
visiblePage_: Object, visiblePage_: Object,
......
...@@ -29,12 +29,6 @@ ...@@ -29,12 +29,6 @@
<structure name="IDR_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_JS" <structure name="IDR_MULTIDEVICE_SETUP_MULTIDEVICE_SETUP_JS"
file="multidevice_setup.js" file="multidevice_setup.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_MULTIDEVICE_SETUP_SETTING_UP_PAGE_HTML"
file="setting_up_page.html"
type="chrome_html" />
<structure name="IDR_MULTIDEVICE_SETUP_SETTING_UP_PAGE_JS"
file="setting_up_page.js"
type="chrome_html" />
<structure name="IDR_MULTIDEVICE_SETUP_SETUP_FAILED_PAGE_HTML" <structure name="IDR_MULTIDEVICE_SETUP_SETUP_FAILED_PAGE_HTML"
file="setup_failed_page.html" file="setup_failed_page.html"
type="chrome_html" /> type="chrome_html" />
......
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/html/cr.html">
<link rel="import" href="button_navigation_behavior.html">
<dom-module id="setting-up-page">
<template>
Setting Up Placeholder Text
</template>
<script src="setting_up_page.js"></script>
</dom-module>
// 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.
/** @polymer */
Polymer({
is: 'setting-up-page',
properties: {
/**
* Overriden from ButtonNavigationBehavior
*/
backwardButtonText: {
type: String,
value: 'Cancel',
},
},
behaviors: [
ButtonNavigationBehavior,
],
});
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