| 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 965227f0e91aecd0f6737520a23d7b4ada0ae79c..5dd3c006652a32fd961d6ad3a1dbf606b6f7d141 100644
|
| --- a/chrome/browser/resources/settings/settings_menu/settings_menu.html
|
| +++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html
|
| @@ -1,20 +1,11 @@
|
| <link rel="import" href="chrome://resources/cr_elements/icons.html">
|
| <link rel="import" href="chrome://resources/html/polymer.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/av-icons.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/device-icons.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/hardware-icons.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/image-icons.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/social-icons.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submenu.html">
|
| +<link rel="import" href="chrome://md-settings/icons.html">
|
| <link rel="import" href="chrome://md-settings/settings_shared_css.html">
|
|
|
| -<if expr="chromeos">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/device-icons.html">
|
| -</if>
|
| -
|
| <dom-module id="settings-menu">
|
| <template>
|
| <style include="settings-shared">
|
| @@ -87,21 +78,22 @@
|
| data-page="basic" id="basicMenu">
|
| <if expr="chromeos">
|
| <div data-section="internet" on-tap="openPage_">
|
| - <iron-icon icon="device:network-wifi" item-icon></iron-icon>
|
| + <iron-icon icon="settings:network-wifi" item-icon></iron-icon>
|
| <span i18n-content="internetPageTitle"></span>
|
| </div>
|
| </if>
|
| <div data-section="people" on-tap="openPage_">
|
| - <iron-icon icon="social:people" item-icon></iron-icon>
|
| + <iron-icon icon="settings:people" item-icon></iron-icon>
|
| <span i18n-content="peoplePageTitle"></span>
|
| </div>
|
| <div data-section="appearance" on-tap="openPage_">
|
| - <iron-icon icon="image:palette" item-icon></iron-icon>
|
| + <iron-icon icon="settings:palette" item-icon></iron-icon>
|
| <span i18n-content="appearancePageTitle"></span>
|
| </div>
|
| <if expr="chromeos">
|
| <div data-section="device" on-tap="openPage_">
|
| - <iron-icon icon="hardware:laptop-chromebook" item-icon></iron-icon>
|
| + <iron-icon icon="settings:laptop-chromebook"
|
| + item-icon></iron-icon>
|
| <span i18n-content="devicePageTitle"></span>
|
| </div>
|
| </if>
|
| @@ -111,12 +103,13 @@
|
| </div>
|
| <if expr="not chromeos">
|
| <div data-section="defaultBrowser" on-tap="openPage_">
|
| - <iron-icon icon="av:web" item-icon></iron-icon>
|
| + <iron-icon icon="settings:web" item-icon></iron-icon>
|
| <span i18n-content="defaultBrowser"></span>
|
| </div>
|
| </if>
|
| <div data-section="onStartup" on-tap="openPage_">
|
| - <iron-icon icon="icons:power-settings-new" item-icon></iron-icon>
|
| + <iron-icon icon="settings:power-settings-new"
|
| + item-icon></iron-icon>
|
| <span i18n-content="onStartup"></span>
|
| </div>
|
| </paper-menu>
|
| @@ -132,44 +125,46 @@
|
| data-page="advanced" id="advancedMenu">
|
| <if expr="chromeos">
|
| <div data-section="dateTime" on-tap="openPage_">
|
| - <iron-icon icon="device:access-time" item-icon></iron-icon>
|
| + <iron-icon icon="settings:access-time" item-icon></iron-icon>
|
| <span i18n-content="dateTimePageTitle"></span>
|
| </div>
|
| </if>
|
| <div data-section="privacy" on-tap="openPage_">
|
| - <iron-icon icon="hardware:security" item-icon></iron-icon>
|
| + <iron-icon icon="settings:security" item-icon></iron-icon>
|
| <span i18n-content="privacyPageTitle"></span>
|
| </div>
|
| <if expr="chromeos">
|
| <div data-section="bluetooth" on-tap="openPage_">
|
| - <iron-icon icon="device:bluetooth" item-icon></iron-icon>
|
| + <iron-icon icon="settings:bluetooth" item-icon></iron-icon>
|
| <span i18n-content="bluetoothPageTitle"></span>
|
| </div>
|
| </if>
|
| <div data-section="passwordsAndForms" on-tap="openPage_">
|
| - <iron-icon icon="icons:assignment" item-icon></iron-icon>
|
| + <iron-icon icon="settings:assignment" item-icon></iron-icon>
|
| <span i18n-content="passwordsAndAutofillPageTitle"></span>
|
| </div>
|
| <div data-section="languages" on-tap="openPage_">
|
| - <iron-icon icon="icons:language" item-icon></iron-icon>
|
| + <iron-icon icon="settings:language" item-icon></iron-icon>
|
| <span i18n-content="languagesPageTitle"></span>
|
| </div>
|
| <div data-section="downloads" on-tap="openPage_">
|
| - <iron-icon icon="icons:file-download" item-icon></iron-icon>
|
| + <iron-icon icon="settings:file-download" item-icon>
|
| + </iron-icon>
|
| <span i18n-content="downloadsPageTitle"></span>
|
| </div>
|
| <div data-section="a11y" on-tap="openPage_">
|
| - <iron-icon icon="icons:accessibility" item-icon></iron-icon>
|
| + <iron-icon icon="settings:accessibility" item-icon>
|
| + </iron-icon>
|
| <span i18n-content="a11yPageTitle"></span>
|
| </div>
|
| <if expr="not chromeos">
|
| <div data-section="system" on-tap="openPage_">
|
| - <iron-icon icon="icons:build" item-icon></iron-icon>
|
| + <iron-icon icon="settings:build" item-icon></iron-icon>
|
| <span i18n-content="systemPageTitle"></span>
|
| </div>
|
| </if>
|
| <div data-section="reset" on-tap="openPage_">
|
| - <iron-icon icon="icons:restore" item-icon></iron-icon>
|
| + <iron-icon icon="settings:restore" item-icon></iron-icon>
|
| <span i18n-content="resetPageTitle"></span>
|
| </div>
|
| </paper-menu>
|
|
|