Chromium Code Reviews| Index: chrome/browser/resources/settings/settings_menu/settings_menu.html |
| diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html b/chrome/browser/resources/settings/settings_menu/settings_menu.html |
| index a44c2bf6c7ec43a651b5dbf5694933dda29d6176..47957cf7c2f4a3f3c48c994dc980a83915fcdfa4 100644 |
| --- a/chrome/browser/resources/settings/settings_menu/settings_menu.html |
| +++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html |
| @@ -38,7 +38,7 @@ |
| padding: 0; |
| } |
| - div[data-section] { |
|
Dan Beam
2016/08/01 19:37:02
this used to make the advanced toggle cursor: poin
|
| + div[data-path] { |
| @apply(--settings-actionable); |
| } |
| @@ -88,102 +88,101 @@ |
| } |
| </style> |
| <paper-menu name="root-menu"> |
| - <div class="page-menu" data-page="basic" id="basicPage"> |
| - <paper-menu attr-for-selected="data-section" class="menu-content" |
| - data-page="basic" id="basicMenu"> |
| + <div class="page-menu" id="basicPage"> |
| + <paper-menu attr-for-selected="data-path" class="menu-content" |
| + id="basicMenu" selected="[[currentRoute.path]]"> |
| <if expr="chromeos"> |
| - <div data-section="internet" on-tap="openPage_"> |
| + <div data-path="/internet" on-tap="openPage_"> |
| <iron-icon icon="settings:network-wifi"></iron-icon> |
| $i18n{internetPageTitle} |
| </div> |
| </if> |
| - <div data-section="people" on-tap="openPage_" |
| + <div data-path="/people" on-tap="openPage_" |
| hidden="[[!pageVisibility.people]]"> |
| <iron-icon icon="settings:people"></iron-icon> |
| $i18n{peoplePageTitle} |
| </div> |
| - <div data-section="appearance" on-tap="openPage_" |
| + <div data-path="/appearance" on-tap="openPage_" |
| hidden="[[!pageVisibility.appearance]]"> |
| <iron-icon icon="settings:palette"></iron-icon> |
| $i18n{appearancePageTitle} |
| </div> |
| <if expr="chromeos"> |
| - <div data-section="device" on-tap="openPage_"> |
| + <div data-path="/device" on-tap="openPage_"> |
| <iron-icon icon="settings:laptop-chromebook"></iron-icon> |
| $i18n{devicePageTitle} |
| </div> |
| </if> |
| - <div data-section="search" on-tap="openPage_"> |
| + <div data-path="/search" on-tap="openPage_"> |
| <iron-icon icon="cr:search"></iron-icon> |
| $i18n{searchPageTitle} |
| </div> |
| <if expr="not chromeos"> |
| - <div data-section="defaultBrowser" on-tap="openPage_" |
| + <div data-path="/defaultBrowser" on-tap="openPage_" |
| hidden="[[!pageVisibility.defaultBrowser]]"> |
| <iron-icon icon="settings:web"></iron-icon> |
| $i18n{defaultBrowser} |
| </div> |
| </if> |
| - <div data-section="onStartup" on-tap="openPage_" |
| + <div data-path="/onStartup" on-tap="openPage_" |
| hidden="[[!pageVisibility.onStartup]]"> |
| <iron-icon icon="settings:power-settings-new"></iron-icon> |
| $i18n{onStartup} |
| </div> |
| </paper-menu> |
| </div> |
| - <paper-submenu class="page-menu" id="advancedPage" data-page="advanced" |
| - opened="{{advancedOpened_}}" |
| - hidden="[[!pageVisibility.advancedSettings]]"> |
| - <div class="menu-trigger" data-section="" on-tap="openPage_"> |
|
Dan Beam
2016/08/01 19:37:02
but you removed data-section="" here
can you fix?
tommycli
2016/08/01 20:06:10
Ah, I see. I will fix.
|
| + <paper-submenu class="page-menu" id="advancedPage" |
| + opened="{{advancedOpened_}}" hidden="[[!pageVisibility.advancedSettings]]"> |
| + <div class="menu-trigger"> |
| <span>$i18n{advancedPageTitle}</span> |
| <iron-icon icon="[[arrowState_(advancedOpened_)]]"></iron-icon> |
| </div> |
| - <paper-menu attr-for-selected="data-section" class="menu-content" |
| - data-page="advanced" id="advancedMenu"> |
| + <paper-menu attr-for-selected="data-path" class="menu-content" |
| + id="advancedMenu" selected="[[currentRoute.path]]"> |
| <if expr="chromeos"> |
| - <div data-section="dateTime" on-tap="openPage_"> |
| + <div data-path="/dateTime" on-tap="openPage_"> |
| <iron-icon icon="settings:access-time"></iron-icon> |
| $i18n{dateTimePageTitle} |
| </div> |
| </if> |
| - <div data-section="privacy" on-tap="openPage_"> |
| + <div data-path="/privacy" on-tap="openPage_"> |
| <iron-icon icon="settings:security"></iron-icon> |
| $i18n{privacyPageTitle} |
| </div> |
| <if expr="chromeos"> |
| - <div data-section="bluetooth" on-tap="openPage_"> |
| + <div data-path="/bluetooth" on-tap="openPage_"> |
| <iron-icon icon="settings:bluetooth"></iron-icon> |
| $i18n{bluetoothPageTitle} |
| </div> |
| </if> |
| - <div data-section="passwordsAndForms" on-tap="openPage_" |
| + <div data-path="/passwords" on-tap="openPage_" |
| hidden="[[!pageVisibility.passwordsAndForms]]"> |
| <iron-icon icon="settings:assignment"></iron-icon> |
| $i18n{passwordsAndAutofillPageTitle} |
| </div> |
| - <div data-section="languages" on-tap="openPage_"> |
| + <div data-path="/languages" on-tap="openPage_"> |
| <iron-icon icon="settings:language"></iron-icon> |
| $i18n{languagesPageTitle} |
| </div> |
| - <div data-section="downloads" on-tap="openPage_"> |
| + <div data-path="/downloadsDirectory" on-tap="openPage_"> |
| <iron-icon icon="cr:file-download"></iron-icon> |
| $i18n{downloadsPageTitle} |
| </div> |
| - <div data-section="printing" on-tap="openPage_"> |
| + <div data-path="/printing" on-tap="openPage_"> |
| <iron-icon icon="cr:print"></iron-icon> |
| $i18n{printingPageTitle} |
| </div> |
| - <div data-section="a11y" on-tap="openPage_"> |
| + <div data-path="/accessibility" on-tap="openPage_"> |
| <iron-icon icon="settings:accessibility"></iron-icon> |
| $i18n{a11yPageTitle} |
| </div> |
| <if expr="not chromeos"> |
| - <div data-section="system" on-tap="openPage_"> |
| + <div data-path="/system" on-tap="openPage_"> |
| <iron-icon icon="settings:build"></iron-icon> |
| $i18n{systemPageTitle} |
| </div> |
| </if> |
| - <div data-section="reset" on-tap="openPage_" |
| + <div data-path="/reset" on-tap="openPage_" |
| hidden="[[!pageVisibility.reset]]"> |
| <iron-icon icon="settings:restore"></iron-icon> |
| $i18n{resetPageTitle} |
| @@ -191,8 +190,8 @@ |
| </paper-menu> |
| </paper-submenu> |
| <div class="separator"></div> |
| - <paper-submenu class="page-menu" data-page="about"> |
| - <div class="menu-trigger" on-tap="openPage_" data-section=""> |
| + <paper-submenu class="page-menu"> |
| + <div class="menu-trigger" on-tap="openPage_" data-path="/help"> |
| $i18n{aboutPageTitle} |
| </div> |
| </paper-submenu> |