| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_drawer/cr_drawer.html
"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_drawer/cr_drawer.html
"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> | 2 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape
r-header-panel.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape
r-header-panel.html"> |
| 7 <link rel="import" href="../direction_delegate.html"> | 7 <link rel="import" href="../direction_delegate.html"> |
| 8 <link rel="import" href="../global_scroll_target_behavior.html"> | 8 <link rel="import" href="../global_scroll_target_behavior.html"> |
| 9 <link rel="import" href="../i18n_setup.html"> | 9 <link rel="import" href="../i18n_setup.html"> |
| 10 <link rel="import" href="../icons.html"> | 10 <link rel="import" href="../icons.html"> |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 } | 75 } |
| 76 </style> | 76 </style> |
| 77 <settings-prefs id="prefs" prefs="{{prefs}}"></settings-prefs> | 77 <settings-prefs id="prefs" prefs="{{prefs}}"></settings-prefs> |
| 78 <cr-toolbar page-name="$i18n{settings}" | 78 <cr-toolbar page-name="$i18n{settings}" |
| 79 clear-label="$i18n{clearSearch}" | 79 clear-label="$i18n{clearSearch}" |
| 80 search-prompt="$i18n{searchPrompt}" | 80 search-prompt="$i18n{searchPrompt}" |
| 81 on-cr-toolbar-menu-tap="onMenuButtonTap_" | 81 on-cr-toolbar-menu-tap="onMenuButtonTap_" |
| 82 spinner-active="[[toolbarSpinnerActive_]]" | 82 spinner-active="[[toolbarSpinnerActive_]]" |
| 83 menu-label="$i18n{menuButtonLabel}" | 83 menu-label="$i18n{menuButtonLabel}" |
| 84 on-search-changed="onSearchChanged_" | 84 on-search-changed="onSearchChanged_" |
| 85 role="none" |
| 85 show-menu> | 86 show-menu> |
| 86 </cr-toolbar> | 87 </cr-toolbar> |
| 87 <dialog id="drawer" is="cr-drawer"> | 88 <dialog id="drawer" is="cr-drawer"> |
| 88 <div class="drawer-header" tabindex="-1">$i18n{settings}</div> | 89 <div class="drawer-header" tabindex="-1">$i18n{settings}</div> |
| 89 <div class="drawer-content"> | 90 <div class="drawer-content"> |
| 90 <template is="dom-if" id="drawerTemplate"> | 91 <template is="dom-if" id="drawerTemplate"> |
| 91 <settings-menu page-visibility="[[pageVisibility_]]" | 92 <settings-menu page-visibility="[[pageVisibility_]]" |
| 92 show-android-apps="[[showAndroidApps_]]" | 93 show-android-apps="[[showAndroidApps_]]" |
| 93 on-iron-activate="onIronActivate_" | 94 on-iron-activate="onIronActivate_" |
| 94 advanced-opened="{{advancedOpened_}}"> | 95 advanced-opened="{{advancedOpened_}}"> |
| 95 </settings-menu> | 96 </settings-menu> |
| 96 </template> | 97 </template> |
| 97 </div> | 98 </div> |
| 98 </dialog> | 99 </dialog> |
| 99 <paper-header-panel id="headerPanel" mode="waterfall"> | 100 <paper-header-panel id="headerPanel" mode="waterfall" role="none"> |
| 100 <settings-main id="main" prefs="{{prefs}}" | 101 <settings-main id="main" prefs="{{prefs}}" |
| 101 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 102 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
| 102 page-visibility="[[pageVisibility_]]" | 103 page-visibility="[[pageVisibility_]]" |
| 103 show-android-apps="[[showAndroidApps_]]" | 104 show-android-apps="[[showAndroidApps_]]" |
| 104 advanced-toggle-expanded="{{advancedOpened_}}"> | 105 advanced-toggle-expanded="{{advancedOpened_}}"> |
| 105 </settings-main> | 106 </settings-main> |
| 106 </paper-header-panel> | 107 </paper-header-panel> |
| 107 </template> | 108 </template> |
| 108 <script src="settings_ui.js"></script> | 109 <script src="settings_ui.js"></script> |
| 109 </dom-module> | 110 </dom-module> |
| OLD | NEW |