chrome/browser/resources/chromeos/login/oobe_welcome.html - Issue 2067153002: ChromeOS: Implement Network Selection screen of material design OOBE.

Side by Side Diff: chrome/browser/resources/chromeos/login/oobe_welcome.html

Issue 2067153002: ChromeOS: Implement Network Selection screen of material design OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Reverted change to web_ui_browser_test.cc that was moved to another CL. Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 <!-- Copyright 2016 The Chromium Authors. All rights reserved.	1 <!-- Copyright 2016 The Chromium Authors. All rights reserved.

2 Use of this source code is governed by a BSD-style license that can be	2 Use of this source code is governed by a BSD-style license that can be

3 found in the LICENSE file. -->	3 found in the LICENSE file. -->

4	4

	5 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html">

	6 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_selec t.html">

	7 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">

5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">	8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">

	9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">

	10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i conset-svg.html">

	11

	12 <iron-iconset-svg name="oobe-welcome" size="24">

	13 <svg>

	14 <defs>

	15 <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path></g>

	16 <g id="wifi"><path d="M1 9l2 2c4.97-4.97 13.03-4.97 18 0l2-2C16.93 2.93 7. 08 2.93 1 9zm8 8l3 3 3-3c-1.65-1.66-4.34-1.66-6 0zm-4-4l2 2c2.76-2.76 7.24-2.76 10 0l2-2C15.14 9.14 8.87 9.14 5 13z"></path></g>

	17 </defs>

	18 </svg>

	19 </iron-iconset-svg>

6	20

7 <dom-module name="oobe-welcome-md">	21 <dom-module name="oobe-welcome-md">

8 <link rel="stylesheet" href="oobe_welcome.css">	22 <link rel="stylesheet" href="oobe_welcome.css">

9 <template>	23 <template>

10 <oobe-card class="fit">	24 <oobe-card id="welcomeSection" class="fit" hidden="[[networkSelectionScreenS hown]]">

11 <div class="header flex vertical layout end-justified start">	25 <div class="header flex vertical layout end-justified start">

12 <h1 class="welcome-message" i18n-content="networkScreenGreeting"></h1>	26 <h1 class="welcome-message" i18n-content="networkScreenGreeting"></h1>

13 </div>	27 </div>

14 <div class="footer flex vertical layout justified">	28 <div class="footer flex vertical layout justified">

15 <div class="welcome-next flex vertical layout center">	29 <div class="welcome-next flex vertical layout center">

16 <oobe-next-button id="welcomeNextButton" on-tap="onWelcomeNextButtonCl icked_"></oobe-next-button>	30 <oobe-next-button id="welcomeNextButton" on-tap="onWelcomeNextButtonCl icked_"></oobe-next-button>

17 </div>	31 </div>

18 <div class="flex horizontal layout justified">	32 <div class="flex horizontal layout justified">

19 <div class="buttonbox layout vertical">	33 <div class="buttonbox layout vertical">

20 <iron-icon icon="icons:language" class="bottom-button self-center">< /iron-icon>	34 <iron-icon icon="icons:language" class="bottom-button self-center">< /iron-icon>

21 <div id="currentLanguage">[[currentLanguage]]</div>	35 <div id="currentLanguage">[[currentLanguage]]</div>

22 </div>	36 </div>

23 <div class="buttonbox layout vertical">	37 <div class="buttonbox layout vertical">

24 <iron-icon icon="icons:accessibility" class="bottom-button self-cent er"></iron-icon>	38 <iron-icon icon="icons:accessibility" class="bottom-button self-cent er"></iron-icon>

25 <div id="accessibilityLabel" i18n-content="accessibilityLink"></div>	39 <div id="accessibilityLabel" i18n-content="accessibilityLink"></div>

26 </div>	40 </div>

27 </div>	41 </div>

28 </div>	42 </div>

29 </oobe-card>	43 </oobe-card>

	44 <oobe-dialog id="networkSection" class="fit" hidden="[[!networkSelectionScre enShown]]">

	45 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon>

	46 <div class="header flex vertical layout end-justified start">

	47 <h1 class="welcome-message" i18n-content="networkSectionTitle"></h1>

	48 <h1 class="welcome-message-hint" i18n-content="networkSectionHint"></h1>

	49 </div>

	50 <div class="footer flex vertical layout justified">

	51 <cr-network-select id="networkSelect"

	52 on-network-connected="onNetworkConnected_"

	53 on-network-item-selected="onNetworkListNetworkItemSelected_"

	54 on-custom-item-selected="onNetworkListCustomItemSelected_"

	55 custom-items="[[_getNetworkCustomItems()]]"

	56 max-height="280">

	57 </cr-network-select>

	58 </div>

	59 </oobe-dialog>

30 </template>	60 </template>

31 </dom-module>	61 </dom-module>

32	62

OLD	NEW

« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_dialog.js ('k') | chrome/browser/resources/chromeos/login/oobe_welcome.js » ('j') | no next file with comments »