Chromium Code Reviews Chromium Code Reviews
Issue 819633002:
Rearanged imports of custom Polymer elements in OOBE. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://oobe/custom_elements.html"> | |
| 2 <link rel="import" href="chrome://resources/polymer/core-animated-pages/core-ani mated-pages.html"> | |
| 3 <link rel="import" href="chrome://resources/polymer/core-iconset-svg/core-iconse t-svg.html"> | |
| 4 <link rel="import" href="chrome://resources/polymer/core-item/core-item.html"> | |
| 5 <link rel="import" href="chrome://resources/polymer/polymer/polymer.html"> | |
| 6 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css"> | |
| 7 | |
| 8 <core-iconset-svg id="host-pairing-icons" iconSize="48"> | |
| 9 <svg> | |
| 10 <defs> | |
| 11 <g id="cast"> | |
| 12 <include src="../../../../app/theme/cast_icon.svg"> | |
| 13 </g> | |
| 14 </defs> | |
| 15 </svg> | |
| 16 </core-iconset-svg> | |
| 17 | |
| 18 <polymer-element name="host-pairing-page" noscript> | |
| 19 <template> | |
| 20 <link rel="stylesheet" href="oobe_screen_host_pairing_page.css"> | |
| 21 | |
| 22 <div id="title"> | |
| 23 <content select=".title"></content> | |
| 24 </div> | |
| 25 <div id="content"> | |
| 26 <content></content> | |
| 27 </div> | |
| 28 </template> | |
| 29 </polymer-element> | |
| 30 | |
| 31 <polymer-element name="host-pairing-screen" extends="oobe-screen"> | |
| 32 <template> | |
| 33 <link rel="stylesheet" href="oobe_screen_host_pairing.css"> | |
| 34 | |
| 35 <core-animated-pages transitions="cross-fade-all" | |
| 36 selected="{{C.page}}"> | |
| 37 <host-pairing-page name="welcome"> | |
| 38 <div class="title">{{'welcomeTitle' | i18n}}</div> | |
| 39 <div>{{'welcomeText' | i18n}}</div> | |
| 40 </host-pairing-page> | |
| 41 <host-pairing-page name="code-confirmation"> | |
| 42 <div class="title">{{'confirmationTitle' | i18n}}</div> | |
| 43 <div id="code">{{C.code}}</div> | |
| 44 </host-pairing-page> | |
| 45 <host-pairing-page name="update"> | |
| 46 <div class="title">{{'updatingTitle' | i18n}}</div> | |
| 47 <!-- Not yet implemented on backend side. --> | |
| 48 <!--div>{{['updatingText', C.downloadedMb, C.totalMb] | i18n}}</div--> | |
| 49 </host-pairing-page> | |
| 50 <host-pairing-page name="enrollment-introduction"> | |
| 51 <div class="title">{{'enrollTitle' | i18n}}</div> | |
| 52 </host-pairing-page> | |
| 53 <host-pairing-page name="enrollment"> | |
| 54 <div class="title"> | |
| 55 <!-- 'enrollmentTitle' contains <strong> tag. We need to wrap it in | |
| 56 'html-echo' to prevent HTML escaping. --> | |
| 57 <html-echo | |
| 58 content="{{['enrollingTitle', C.enrollmentDomain] | i18n}}"> | |
| 59 </html-echo> | |
| 60 </div> | |
| 61 </host-pairing-page> | |
| 62 <host-pairing-page name="enrollment-error"> | |
| 63 <div class="title">{{'enrollmentErrorTitle' | i18n}}</div> | |
| 64 <div>{{'errorNeedsRestart' | i18n}}</div> | |
| 65 </host-pairing-page> | |
| 66 <host-pairing-page name="pairing-done"> | |
| 67 <div class="title">{{'doneTitle' | i18n}}</div> | |
| 68 <div>{{'doneText' | i18n}}</div> | |
| 69 </host-pairing-page> | |
| 70 </core-animated-pages> | |
| 71 <core-item id="device-indicator"class="font-scalable" | |
| 72 icon="host-pairing-icons:cast"> | |
| 73 <div id="device-label">{{C.deviceName}}</div> | |
| 74 </core-item> | |
| 75 <div id="illustration"></div> | |
| 76 </template> | |
| 77 </polymer-element> | |
| 78 | |
| 79 <div class="step hidden no-logo fullscreen" id="host-pairing" hidden> | 1 <div class="step hidden no-logo fullscreen" id="host-pairing" hidden> |
| 80 <host-pairing-screen name="HostPairingScreen"></host-pairing-screen> | 2 <host-pairing-screen name="HostPairingScreen"></host-pairing-screen> |
| 81 </div> | 3 </div> |
| 82 | 4 |
|
ygorshenin1
2014/12/22 16:48:58
init: could you please remove blank line #4?
dzhioev (left Google)
2014/12/22 17:48:33
Done.
| |
| OLD | NEW |
