| 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"> | 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"> | 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"> | 7 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
     l"> | 
| 8 <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"> | 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"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i
     conset-svg.html"> | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
| 33       </g> | 33       </g> | 
| 34       <g id="add-proxy" fill="none" fill-rule="evenodd"> | 34       <g id="add-proxy" fill="none" fill-rule="evenodd"> | 
| 35         <g fill="#000"> | 35         <g fill="#000"> | 
| 36           <path d="M16 14v-3h-2v3h-3v2h3v3h2v-3h3v-2h-3z"></path> | 36           <path d="M16 14v-3h-2v3h-3v2h3v3h2v-3h3v-2h-3z"></path> | 
| 37           <path d="M8.04 15.48c-.74-.1-1.43-.33-2.06-.66-.04-.02-.07-.03-.11-.05
     l-.24-.15c-.09-.05-.18-.11-.27-.17-.06-.04-.11-.08-.17-.13-.11-.07-.21-.15-.31-.
     23-.05-.04-.09-.08-.14-.12-.1-.1-.2-.19-.3-.29l-.12-.12c-.09-.11-.19-.21-.28-.33
     -.04-.04-.07-.08-.1-.12-.09-.12-.18-.24-.26-.36-.03-.04-.06-.09-.09-.13-.08-.13-
     .15-.25-.22-.38-.03-.05-.06-.1-.08-.15-.07-.13-.13-.26-.19-.4-.02-.05-.05-.1-.07
     -.16-.05-.13-.1-.27-.14-.41-.02-.05-.04-.11-.06-.17-.04-.14-.07-.28-.1-.42-.02-.
     06-.04-.13-.05-.19-.03-.15-.05-.29-.06-.44l-.03-.18c-.02-.21-.03-.42-.03-.64 0-.
     5.06-.97.16-1.44l3.75 3.86v.81c0 .88.71 1.61 1.57 1.61v1.56zm3.13-5.4v-.19c0-.45
     -.35-.81-.78-.81h-4.7V7.47h1.57c.43 0 .78-.36.78-.81V5.05H9.6c.86 0 1.57-.73 1.5
     7-1.61v-.33c2.06.86 3.57 2.82 3.86 5.16h-.01c0 .04.01.07.01.1h.12c.51 0 1 .07 1.
     47.21 0-.1 0-.21-.01-.31-.32-3.24-2.51-5.93-5.44-6.88h-.01c-.03-.01-.06-.02-.08-
     .03-.2-.06-.4-.11-.6-.16-.07-.01-.14-.02-.2-.04-.18-.03-.36-.06-.53-.08-.07-.01-
     .14-.02-.2-.02-.24-.03-.48-.04-.73-.04C4.5 1.02 1 4.63 1 9.08c0 4.45 3.5 8.06 7.
     82 8.06.51 0 1-.05 1.48-.14-.47-.85-.74-1.83-.74-2.87 0-1.58.61-3.01 1.61-4.05z"
      fill-opacity=".3"></path> | 37           <path d="M8.04 15.48c-.74-.1-1.43-.33-2.06-.66-.04-.02-.07-.03-.11-.05
     l-.24-.15c-.09-.05-.18-.11-.27-.17-.06-.04-.11-.08-.17-.13-.11-.07-.21-.15-.31-.
     23-.05-.04-.09-.08-.14-.12-.1-.1-.2-.19-.3-.29l-.12-.12c-.09-.11-.19-.21-.28-.33
     -.04-.04-.07-.08-.1-.12-.09-.12-.18-.24-.26-.36-.03-.04-.06-.09-.09-.13-.08-.13-
     .15-.25-.22-.38-.03-.05-.06-.1-.08-.15-.07-.13-.13-.26-.19-.4-.02-.05-.05-.1-.07
     -.16-.05-.13-.1-.27-.14-.41-.02-.05-.04-.11-.06-.17-.04-.14-.07-.28-.1-.42-.02-.
     06-.04-.13-.05-.19-.03-.15-.05-.29-.06-.44l-.03-.18c-.02-.21-.03-.42-.03-.64 0-.
     5.06-.97.16-1.44l3.75 3.86v.81c0 .88.71 1.61 1.57 1.61v1.56zm3.13-5.4v-.19c0-.45
     -.35-.81-.78-.81h-4.7V7.47h1.57c.43 0 .78-.36.78-.81V5.05H9.6c.86 0 1.57-.73 1.5
     7-1.61v-.33c2.06.86 3.57 2.82 3.86 5.16h-.01c0 .04.01.07.01.1h.12c.51 0 1 .07 1.
     47.21 0-.1 0-.21-.01-.31-.32-3.24-2.51-5.93-5.44-6.88h-.01c-.03-.01-.06-.02-.08-
     .03-.2-.06-.4-.11-.6-.16-.07-.01-.14-.02-.2-.04-.18-.03-.36-.06-.53-.08-.07-.01-
     .14-.02-.2-.02-.24-.03-.48-.04-.73-.04C4.5 1.02 1 4.63 1 9.08c0 4.45 3.5 8.06 7.
     82 8.06.51 0 1-.05 1.48-.14-.47-.85-.74-1.83-.74-2.87 0-1.58.61-3.01 1.61-4.05z"
      fill-opacity=".3"></path> | 
| 38         </g> | 38         </g> | 
| 39       </g> | 39       </g> | 
| 40     </defs> | 40     </defs> | 
| 41   </svg> | 41   </svg> | 
| 42 </iron-iconset-svg> | 42 </iron-iconset-svg> | 
|  | 43 <iron-iconset-svg name="oobe-welcome-64" size="64"> | 
|  | 44   <svg> | 
|  | 45     <defs> | 
|  | 46       <g id="timezone" fill="none" fill-rule="evenodd"> | 
|  | 47         <path d="M0 0h64v64H0"></path> | 
|  | 48         <path d="M31.987 5.333C17.253 5.333 5.333 17.267 5.333 32c0 14.733 11.92
      26.667 26.654 26.667 14.733 0 26.68-11.934 26.68-26.667 0-14.733-11.947-26.667-
     26.68-26.667zm.013 48c-11.787 0-21.333-9.546-21.333-21.333 0-11.787 9.546-21.333
      21.333-21.333 11.787 0 21.333 9.546 21.333 21.333 0 11.787-9.546 21.333-21.333 
     21.333z" fill="#5A5A5A"></path> | 
|  | 49         <path fill="#5A5A5A" d="M33.333 18.667h-4v16l13.987 8.4 2.013-3.28-12-7.
     12"></path> | 
|  | 50       </g> | 
|  | 51     </defs> | 
|  | 52   </svg> | 
|  | 53 </iron-iconset-svg> | 
| 43 | 54 | 
| 44 <dom-module name="oobe-welcome-md"> | 55 <dom-module name="oobe-welcome-md"> | 
| 45   <template> | 56   <template> | 
| 46     <link rel="stylesheet" href="oobe_dialog_host.css"> | 57     <link rel="stylesheet" href="oobe_dialog_host.css"> | 
| 47     <link rel="stylesheet" href="oobe_welcome.css"> | 58     <link rel="stylesheet" href="oobe_welcome.css"> | 
| 48     <link rel="stylesheet" href="oobe_dialog_parameters.css"> | 59     <link rel="stylesheet" href="oobe_dialog_parameters.css"> | 
| 49     <oobe-welcome-dialog id="welcomeScreen" hidden="[[!welcomeScreenShown]]" | 60     <oobe-welcome-dialog id="welcomeScreen" hidden="[[!welcomeScreenShown]]" | 
| 50         current-language="[[currentLanguage]]" | 61         current-language="[[currentLanguage]]" | 
| 51         on-language-button-clicked="onWelcomeSelectLanguageButtonClicked_" | 62         on-language-button-clicked="onWelcomeSelectLanguageButtonClicked_" | 
| 52         on-accessibility-button-clicked="onWelcomeAccessibilityButtonClicked_" | 63         on-accessibility-button-clicked="onWelcomeAccessibilityButtonClicked_" | 
| 53         on-next-button-clicked="onWelcomeNextButtonClicked_"> | 64         on-timezone-button-clicked="onWelcomeTimezoneButtonClicked_" | 
|  | 65         on-next-button-clicked="onWelcomeNextButtonClicked_" | 
|  | 66         timezone-button-visible="[[isTimezoneButtonVisible_(highlightStrength)]]
     " | 
|  | 67         > | 
| 54     </oobe-welcome-dialog> | 68     </oobe-welcome-dialog> | 
| 55     <oobe-dialog id="languageScreen" hidden="[[!languageSelectionScreenShown]]" | 69     <oobe-dialog id="languageScreen" hidden="[[!languageSelectionScreenShown]]" | 
| 56        has-buttons> | 70        has-buttons> | 
| 57       <iron-icon icon="icons:language" class="oobe-icon"></iron-icon> | 71       <iron-icon icon="icons:language" class="oobe-icon"></iron-icon> | 
| 58       <div class="header"> | 72       <div class="header"> | 
| 59         <h1 class="title" i18n-content="languageSectionTitle"></h1> | 73         <h1 class="title" i18n-content="languageSectionTitle"></h1> | 
| 60       </div> | 74       </div> | 
| 61       <div class="footer layout vertical"> | 75       <div class="footer layout vertical"> | 
| 62         <template is="dom-if" if="[[enabled]]"> | 76         <template is="dom-if" if="[[enabled]]"> | 
| 63           <div id="languageDropdownContainer" | 77           <div id="languageDropdownContainer" | 
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 141           <span class="unchecked-value" i18n-content="virtualKeyboardOptionOff"> | 155           <span class="unchecked-value" i18n-content="virtualKeyboardOptionOff"> | 
| 142           </span> | 156           </span> | 
| 143         </oobe-a11y-option> | 157         </oobe-a11y-option> | 
| 144       </div> | 158       </div> | 
| 145       <div class="bottom-buttons layout horizontal end-justified"> | 159       <div class="bottom-buttons layout horizontal end-justified"> | 
| 146         <oobe-text-button inverse on-tap="closeAccessibilitySection_"> | 160         <oobe-text-button inverse on-tap="closeAccessibilitySection_"> | 
| 147           <div i18n-content="oobeOKButtonText"></div> | 161           <div i18n-content="oobeOKButtonText"></div> | 
| 148         </oobe-text-button> | 162         </oobe-text-button> | 
| 149       </div> | 163       </div> | 
| 150     </oobe-dialog> | 164     </oobe-dialog> | 
|  | 165     <oobe-dialog id="timezoneScreen" hidden="[[!timezoneScreenShown]]" | 
|  | 166        has-buttons> | 
|  | 167       <iron-icon icon="oobe-welcome-64:timezone" class="oobe-icon"></iron-icon> | 
|  | 168       <div class="header"> | 
|  | 169         <h1 class="title" i18n-content="timezoneSectionTitle"></h1> | 
|  | 170       </div> | 
|  | 171       <div class="footer layout vertical"> | 
|  | 172         <div class="flex layout horizontal justified timezone-selection-entry"> | 
|  | 173           <div class="timezone-selection-title layout vertical center-justified" | 
|  | 174               i18n-content="timezoneDropdownTitle"> | 
|  | 175           </div> | 
|  | 176           <oobe-i18n-dropdown id="timezoneSelect" items="[[timezones]]" | 
|  | 177               on-select-item="onTimezoneSelected_" | 
|  | 178               label="$i18n{timezoneDropdownTitle}"> | 
|  | 179           </oobe-i18n-dropdown> | 
|  | 180         </div> | 
|  | 181       </div> | 
|  | 182       <div class="bottom-buttons layout horizontal end-justified"> | 
|  | 183         <oobe-text-button inverse on-tap="closeTimezoneSection_"> | 
|  | 184           <div i18n-content="oobeOKButtonText"></div> | 
|  | 185         </oobe-text-button> | 
|  | 186       </div> | 
|  | 187     </oobe-dialog> | 
| 151     <oobe-dialog id="networkSelectionScreen" | 188     <oobe-dialog id="networkSelectionScreen" | 
| 152         hidden="[[!networkSelectionScreenShown]]" has-buttons> | 189         hidden="[[!networkSelectionScreenShown]]" has-buttons> | 
| 153       <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon> | 190       <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon> | 
| 154       <div class="header"> | 191       <div class="header"> | 
| 155         <h1 class="title" i18n-content="networkSectionTitle"></h1> | 192         <h1 class="title" i18n-content="networkSectionTitle"></h1> | 
| 156         <div class="subtitle" i18n-content="networkSectionHint"></div> | 193         <div class="subtitle" i18n-content="networkSectionHint"></div> | 
| 157       </div> | 194       </div> | 
| 158       <div class="footer layout vertical"> | 195       <div class="footer layout vertical"> | 
| 159         <cr-network-select id="networkSelect" | 196         <cr-network-select id="networkSelect" | 
| 160             on-network-connected="onNetworkConnected_" | 197             on-network-connected="onNetworkConnected_" | 
| 161             on-network-item-selected="onNetworkListNetworkItemSelected_" | 198             on-network-item-selected="onNetworkListNetworkItemSelected_" | 
| 162             on-custom-item-selected="onNetworkListCustomItemSelected_" | 199             on-custom-item-selected="onNetworkListCustomItemSelected_" | 
| 163             custom-items="[[_getNetworkCustomItems()]]" | 200             custom-items="[[_getNetworkCustomItems()]]" | 
| 164             max-height="307"> | 201             max-height="307"> | 
| 165         </cr-network-select> | 202         </cr-network-select> | 
| 166       </div> | 203       </div> | 
| 167       <div class="bottom-buttons layout horizontal start-justified"> | 204       <div class="bottom-buttons layout horizontal start-justified"> | 
| 168         <oobe-back-button on-tap="onNetworkSelectionBackButtonPressed_"> | 205         <oobe-back-button on-tap="onNetworkSelectionBackButtonPressed_"> | 
| 169         </oobe-back-button> | 206         </oobe-back-button> | 
| 170       </div> | 207       </div> | 
| 171     </oobe-dialog> | 208     </oobe-dialog> | 
| 172   </template> | 209   </template> | 
| 173 </dom-module> | 210 </dom-module> | 
| OLD | NEW | 
|---|