Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 2 <link rel="import" href="chrome://resources/html/assert.html"> | |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp le.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp le.html"> |
| 7 <link rel="import" href="/icons.html"> | 8 <link rel="import" href="/icons.html"> |
| 8 <link rel="import" href="/settings_shared_css.html"> | 9 <link rel="import" href="/settings_shared_css.html"> |
| 9 | 10 |
| 10 <dom-module id="settings-menu"> | 11 <dom-module id="settings-menu"> |
| 11 <template> | 12 <template> |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 88 <paper-menu name="root-menu"> | 89 <paper-menu name="root-menu"> |
| 89 <div class="page-menu" data-page="basic" id="basicPage"> | 90 <div class="page-menu" data-page="basic" id="basicPage"> |
| 90 <paper-menu attr-for-selected="data-section" class="menu-content" | 91 <paper-menu attr-for-selected="data-section" class="menu-content" |
| 91 data-page="basic" id="basicMenu"> | 92 data-page="basic" id="basicMenu"> |
| 92 <if expr="chromeos"> | 93 <if expr="chromeos"> |
| 93 <div data-section="internet" on-tap="openPage_"> | 94 <div data-section="internet" on-tap="openPage_"> |
| 94 <iron-icon icon="settings:network-wifi"></iron-icon> | 95 <iron-icon icon="settings:network-wifi"></iron-icon> |
| 95 $i18n{internetPageTitle} | 96 $i18n{internetPageTitle} |
| 96 </div> | 97 </div> |
| 97 </if> | 98 </if> |
| 98 <div data-section="people" on-tap="openPage_"> | 99 <div data-section="people" on-tap="openPage_" |
| 100 hidden="[[!pageVisibility.people]]"> | |
|
dpapad
2016/07/22 22:40:48
IIUC <settings-ui>'s pageVisibility_ is undefined
Moe
2016/07/24 23:54:27
They are ignored which is what we want.
dpapad
2016/07/25 19:37:10
Can we at least add a comment somewhere (probably
| |
| 99 <iron-icon icon="settings:people"></iron-icon> | 101 <iron-icon icon="settings:people"></iron-icon> |
| 100 $i18n{peoplePageTitle} | 102 $i18n{peoplePageTitle} |
| 101 </div> | 103 </div> |
| 102 <div data-section="appearance" on-tap="openPage_"> | 104 <div data-section="appearance" on-tap="openPage_" |
| 105 hidden="[[!pageVisibility.appearance]]"> | |
| 103 <iron-icon icon="settings:palette"></iron-icon> | 106 <iron-icon icon="settings:palette"></iron-icon> |
| 104 $i18n{appearancePageTitle} | 107 $i18n{appearancePageTitle} |
| 105 </div> | 108 </div> |
| 106 <if expr="chromeos"> | 109 <if expr="chromeos"> |
| 107 <div data-section="device" on-tap="openPage_"> | 110 <div data-section="device" on-tap="openPage_"> |
| 108 <iron-icon icon="settings:laptop-chromebook"></iron-icon> | 111 <iron-icon icon="settings:laptop-chromebook"></iron-icon> |
| 109 $i18n{devicePageTitle} | 112 $i18n{devicePageTitle} |
| 110 </div> | 113 </div> |
| 111 </if> | 114 </if> |
| 112 <div data-section="search" on-tap="openPage_"> | 115 <div data-section="search" on-tap="openPage_"> |
| 113 <iron-icon icon="cr:search"></iron-icon> | 116 <iron-icon icon="cr:search"></iron-icon> |
| 114 $i18n{searchPageTitle} | 117 $i18n{searchPageTitle} |
| 115 </div> | 118 </div> |
| 116 <if expr="not chromeos"> | 119 <if expr="not chromeos"> |
| 117 <div data-section="defaultBrowser" on-tap="openPage_"> | 120 <div data-section="defaultBrowser" on-tap="openPage_" |
| 121 hidden="[[!pageVisibility.defaultBrowser]]"> | |
| 118 <iron-icon icon="settings:web"></iron-icon> | 122 <iron-icon icon="settings:web"></iron-icon> |
| 119 $i18n{defaultBrowser} | 123 $i18n{defaultBrowser} |
| 120 </div> | 124 </div> |
| 121 </if> | 125 </if> |
| 122 <div data-section="onStartup" on-tap="openPage_"> | 126 <div data-section="onStartup" on-tap="openPage_" |
| 127 hidden="[[!pageVisibility.onStartup]]"> | |
| 123 <iron-icon icon="settings:power-settings-new"></iron-icon> | 128 <iron-icon icon="settings:power-settings-new"></iron-icon> |
| 124 $i18n{onStartup} | 129 $i18n{onStartup} |
| 125 </div> | 130 </div> |
| 126 </paper-menu> | 131 </paper-menu> |
| 127 </div> | 132 </div> |
| 128 <paper-submenu class="page-menu" id="advancedPage" data-page="advanced" | 133 <paper-submenu class="page-menu" id="advancedPage" data-page="advanced" |
| 129 opened="{{advancedOpened_}}"> | 134 opened="{{advancedOpened_}}" |
| 135 hidden="[[!pageVisibility.advancedSettings]]"> | |
| 130 <div class="menu-trigger" data-section="" on-tap="openPage_"> | 136 <div class="menu-trigger" data-section="" on-tap="openPage_"> |
| 131 <span>$i18n{advancedPageTitle}</span> | 137 <span>$i18n{advancedPageTitle}</span> |
| 132 <iron-icon icon="[[arrowState_(advancedOpened_)]]"></iron-icon> | 138 <iron-icon icon="[[arrowState_(advancedOpened_)]]"></iron-icon> |
| 133 </div> | 139 </div> |
| 134 <paper-menu attr-for-selected="data-section" class="menu-content" | 140 <paper-menu attr-for-selected="data-section" class="menu-content" |
| 135 data-page="advanced" id="advancedMenu"> | 141 data-page="advanced" id="advancedMenu"> |
| 136 <if expr="chromeos"> | 142 <if expr="chromeos"> |
| 137 <div data-section="dateTime" on-tap="openPage_"> | 143 <div data-section="dateTime" on-tap="openPage_"> |
| 138 <iron-icon icon="settings:access-time"></iron-icon> | 144 <iron-icon icon="settings:access-time"></iron-icon> |
| 139 $i18n{dateTimePageTitle} | 145 $i18n{dateTimePageTitle} |
| 140 </div> | 146 </div> |
| 141 </if> | 147 </if> |
| 142 <div data-section="privacy" on-tap="openPage_"> | 148 <div data-section="privacy" on-tap="openPage_"> |
| 143 <iron-icon icon="settings:security"></iron-icon> | 149 <iron-icon icon="settings:security"></iron-icon> |
| 144 $i18n{privacyPageTitle} | 150 $i18n{privacyPageTitle} |
| 145 </div> | 151 </div> |
| 146 <if expr="chromeos"> | 152 <if expr="chromeos"> |
| 147 <div data-section="bluetooth" on-tap="openPage_"> | 153 <div data-section="bluetooth" on-tap="openPage_"> |
| 148 <iron-icon icon="settings:bluetooth"></iron-icon> | 154 <iron-icon icon="settings:bluetooth"></iron-icon> |
| 149 $i18n{bluetoothPageTitle} | 155 $i18n{bluetoothPageTitle} |
| 150 </div> | 156 </div> |
| 151 </if> | 157 </if> |
| 152 <div data-section="passwordsAndForms" on-tap="openPage_"> | 158 <div data-section="passwordsAndForms" on-tap="openPage_" |
| 159 hidden="[[!pageVisibility.passwordsAndForms]]"> | |
| 153 <iron-icon icon="settings:assignment"></iron-icon> | 160 <iron-icon icon="settings:assignment"></iron-icon> |
| 154 $i18n{passwordsAndAutofillPageTitle} | 161 $i18n{passwordsAndAutofillPageTitle} |
| 155 </div> | 162 </div> |
| 156 <div data-section="languages" on-tap="openPage_"> | 163 <div data-section="languages" on-tap="openPage_"> |
| 157 <iron-icon icon="settings:language"></iron-icon> | 164 <iron-icon icon="settings:language"></iron-icon> |
| 158 $i18n{languagesPageTitle} | 165 $i18n{languagesPageTitle} |
| 159 </div> | 166 </div> |
| 160 <div data-section="downloads" on-tap="openPage_"> | 167 <div data-section="downloads" on-tap="openPage_"> |
| 161 <iron-icon icon="cr:file-download"></iron-icon> | 168 <iron-icon icon="cr:file-download"></iron-icon> |
| 162 $i18n{downloadsPageTitle} | 169 $i18n{downloadsPageTitle} |
| 163 </div> | 170 </div> |
| 164 <div data-section="printing" on-tap="openPage_"> | 171 <div data-section="printing" on-tap="openPage_"> |
| 165 <iron-icon icon="cr:print"></iron-icon> | 172 <iron-icon icon="cr:print"></iron-icon> |
| 166 $i18n{printingPageTitle} | 173 $i18n{printingPageTitle} |
| 167 </div> | 174 </div> |
| 168 <div data-section="a11y" on-tap="openPage_"> | 175 <div data-section="a11y" on-tap="openPage_"> |
| 169 <iron-icon icon="settings:accessibility"></iron-icon> | 176 <iron-icon icon="settings:accessibility"></iron-icon> |
| 170 $i18n{a11yPageTitle} | 177 $i18n{a11yPageTitle} |
| 171 </div> | 178 </div> |
| 172 <if expr="not chromeos"> | 179 <if expr="not chromeos"> |
| 173 <div data-section="system" on-tap="openPage_"> | 180 <div data-section="system" on-tap="openPage_"> |
| 174 <iron-icon icon="settings:build"></iron-icon> | 181 <iron-icon icon="settings:build"></iron-icon> |
| 175 $i18n{systemPageTitle} | 182 $i18n{systemPageTitle} |
| 176 </div> | 183 </div> |
| 177 </if> | 184 </if> |
| 178 <div data-section="reset" on-tap="openPage_"> | 185 <div data-section="reset" on-tap="openPage_" |
| 186 hidden="[[!pageVisibility.reset]]"> | |
| 179 <iron-icon icon="settings:restore"></iron-icon> | 187 <iron-icon icon="settings:restore"></iron-icon> |
| 180 $i18n{resetPageTitle} | 188 $i18n{resetPageTitle} |
| 181 </div> | 189 </div> |
| 182 </paper-menu> | 190 </paper-menu> |
| 183 </paper-submenu> | 191 </paper-submenu> |
| 184 <div class="separator"></div> | 192 <div class="separator"></div> |
| 185 <paper-submenu class="page-menu" data-page="about"> | 193 <paper-submenu class="page-menu" data-page="about"> |
| 186 <div class="menu-trigger" on-tap="openPage_" data-section=""> | 194 <div class="menu-trigger" on-tap="openPage_" data-section=""> |
| 187 $i18n{aboutPageTitle} | 195 $i18n{aboutPageTitle} |
| 188 </div> | 196 </div> |
| 189 </paper-submenu> | 197 </paper-submenu> |
| 190 </paper-menu> | 198 </paper-menu> |
| 191 </template> | 199 </template> |
| 192 <script src="settings_menu.js"></script> | 200 <script src="settings_menu.js"></script> |
| 193 </dom-module> | 201 </dom-module> |
| OLD | NEW |