Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> | 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> |
| 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/html/polymer.html"> | 5 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
| 9 <link rel="import" href="/prefs/prefs.html"> | 9 <link rel="import" href="/prefs/prefs.html"> |
| 10 <link rel="import" href="/route.html"> | 10 <link rel="import" href="/route.html"> |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 27 -webkit-margin-start: 4px; | 27 -webkit-margin-start: 4px; |
| 28 height: 24px; | 28 height: 24px; |
| 29 width: 24px; | 29 width: 24px; |
| 30 } | 30 } |
| 31 </style> | 31 </style> |
| 32 <settings-animated-pages id="pages" section="internet"> | 32 <settings-animated-pages id="pages" section="internet"> |
| 33 <neon-animatable route-path="default"> | 33 <neon-animatable route-path="default"> |
| 34 <network-summary on-show-detail="onShowDetail_" | 34 <network-summary on-show-detail="onShowDetail_" |
| 35 default-network="{{defaultNetwork}}" | 35 default-network="{{defaultNetwork}}" |
| 36 on-show-known-networks="onShowKnownNetworks_" | 36 on-show-known-networks="onShowKnownNetworks_" |
| 37 global-policy="[[globalPolicy_]]" | |
| 37 networking-private="[[networkingPrivate]]"> | 38 networking-private="[[networkingPrivate]]"> |
| 38 </network-summary> | 39 </network-summary> |
| 39 <div actionable class="settings-box two-line" | 40 <template is="dom-if" if="[[allowAddConnection_(globalPolicy_)]]"> |
| 40 on-tap="onExpandAddConnectionsTap_"> | 41 <div actionable class="settings-box two-line" |
| 41 <div class="start layout horizontal center"> | 42 on-tap="onExpandAddConnectionsTap_"> |
| 42 <iron-icon icon="cr:add"></iron-icon> | 43 <div class="start layout horizontal center"> |
| 43 <div>$i18n{internetAddConnection}</div> | 44 <iron-icon icon="cr:add"></iron-icon> |
| 45 <div>$i18n{internetAddConnection}</div> | |
| 46 </div> | |
| 47 <cr-expand-button alt="$i18n{internetAddConnectionExpandA11yLabel}" | |
| 48 id="expandAddConnections" expanded="{{addConnectionExpanded_}}"> | |
| 49 </cr-expand-button> | |
| 44 </div> | 50 </div> |
| 45 <cr-expand-button alt="$i18n{internetAddConnectionExpandA11yLabel}" | 51 <template is="dom-if" if="[[addConnectionExpanded_]]"> |
| 46 id="expandAddConnections" expanded="{{addConnectionExpanded_}}"> | 52 <div actionable class="settings-box continuation center" |
| 47 </cr-expand-button> | 53 on-tap="onAddWiFiTap_"> |
| 48 </div> | 54 <div class="start add-no-icon">$i18n{internetAddWiFi}</div> |
| 49 <template is="dom-if" if="[[addConnectionExpanded_]]"> | 55 <button class="icon-external" is="paper-icon-button-light"></butto n> |
|
emaxx
2017/01/17 22:14:06
nit: This line and line 60 are longer than 80 char
stevenjb
2017/01/17 22:27:40
Done.
| |
| 50 <div actionable class="settings-box continuation center" | 56 </div> |
| 51 on-tap="onAddWiFiTap_"> | 57 <div actionable class="settings-box continuation center" |
| 52 <div class="start add-no-icon">$i18n{internetAddWiFi}</div> | 58 on-tap="onAddVPNTap_"> |
| 53 <button class="icon-external" is="paper-icon-button-light"></button> | 59 <div class="start add-no-icon">$i18n{internetAddVPN}</div> |
| 60 <button class="icon-external" is="paper-icon-button-light"></butto n> | |
| 61 </div> | |
| 62 <template is="dom-repeat" items="[[thirdPartyVpnProviders_]]"> | |
| 63 <div actionable class="settings-box continuation center" | |
| 64 on-tap="onAddThirdPartyVpnTap_" provider="[[item]]"> | |
| 65 <div class="start add-no-icon"> | |
| 66 [[getAddThirdParrtyVpnLabel_(item)]] | |
| 67 </div> | |
| 68 </div> | |
| 69 </template> | |
| 70 </template> | |
| 71 </template> | |
| 72 <template is="dom-if" if="[[!allowAddConnection_(globalPolicy_)]]"> | |
| 73 <div class="settings-box"> | |
| 74 <iron-icon class="policy" icon="cr:domain"></iron-icon> | |
| 75 <div>$i18n{internetAddConnectionNotAllowed}</div> | |
| 54 </div> | 76 </div> |
| 55 <div actionable class="settings-box continuation center" | |
| 56 on-tap="onAddVPNTap_"> | |
| 57 <div class="start add-no-icon">$i18n{internetAddVPN}</div> | |
| 58 <button class="icon-external" is="paper-icon-button-light"></button> | |
| 59 </div> | |
| 60 <template is="dom-repeat" items="[[thirdPartyVpnProviders_]]"> | |
| 61 <div actionable class="settings-box continuation center" | |
| 62 on-tap="onAddThirdPartyVpnTap_" provider="[[item]]"> | |
| 63 <div class="start add-no-icon"> | |
| 64 [[getAddThirdParrtyVpnLabel_(item)]] | |
| 65 </div> | |
| 66 </div> | |
| 67 </template> | |
| 68 </template> | 77 </template> |
| 69 </neon-animatable> | 78 </neon-animatable> |
| 70 <template is="dom-if" route-path="/networkDetail" no-search> | 79 <template is="dom-if" route-path="/networkDetail" no-search> |
| 71 <settings-subpage page-title="$i18n{internetDetailPageTitle}"> | 80 <settings-subpage page-title="$i18n{internetDetailPageTitle}"> |
| 72 <settings-internet-detail-page prefs="{{prefs}}" | 81 <settings-internet-detail-page prefs="{{prefs}}" |
| 73 default-network="[[defaultNetwork]]" | 82 default-network="[[defaultNetwork]]" |
| 83 global-policy="[[globalPolicy_]]" | |
| 74 networking-private="[[networkingPrivate]]"> | 84 networking-private="[[networkingPrivate]]"> |
| 75 </settings-internet-detail-page> | 85 </settings-internet-detail-page> |
| 76 </settings-subpage> | 86 </settings-subpage> |
| 77 </template> | 87 </template> |
| 78 <template is="dom-if" route-path="/knownNetworks" no-search> | 88 <template is="dom-if" route-path="/knownNetworks" no-search> |
| 79 <settings-subpage page-title="$i18n{internetKnownNetworksPageTitle}"> | 89 <settings-subpage page-title="$i18n{internetKnownNetworksPageTitle}"> |
| 80 <settings-internet-known-networks-page | 90 <settings-internet-known-networks-page |
| 81 network-type="[[knownNetworksType_]]" | 91 network-type="[[knownNetworksType_]]" |
| 82 on-show-detail="onShowDetail_" | 92 on-show-detail="onShowDetail_" |
| 83 networking-private="[[networkingPrivate]]"> | 93 networking-private="[[networkingPrivate]]"> |
| 84 </settings-internet-known-networks-page> | 94 </settings-internet-known-networks-page> |
| 85 </settings-subpage> | 95 </settings-subpage> |
| 86 </template> | 96 </template> |
| 87 </settings-animated-pages> | 97 </settings-animated-pages> |
| 88 </template> | 98 </template> |
| 89 <script src="internet_page.js"></script> | 99 <script src="internet_page.js"></script> |
| 90 </dom-module> | 100 </dom-module> |
| OLD | NEW |