| 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="../direction_delegate.html"> | 6 <link rel="import" href="../direction_delegate.html"> |
| 7 <link rel="import" href="../global_scroll_target_behavior.html"> | 7 <link rel="import" href="../global_scroll_target_behavior.html"> |
| 8 <link rel="import" href="../i18n_setup.html"> | 8 <link rel="import" href="../i18n_setup.html"> |
| 9 <link rel="import" href="../icons.html"> | 9 <link rel="import" href="../icons.html"> |
| 10 <link rel="import" href="../settings_main/settings_main.html"> | 10 <link rel="import" href="../settings_main/settings_main.html"> |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 <cr-toolbar page-name="$i18n{settings}" | 85 <cr-toolbar page-name="$i18n{settings}" |
| 86 clear-label="$i18n{clearSearch}" | 86 clear-label="$i18n{clearSearch}" |
| 87 search-prompt="$i18n{searchPrompt}" | 87 search-prompt="$i18n{searchPrompt}" |
| 88 on-cr-toolbar-menu-tap="onMenuButtonTap_" | 88 on-cr-toolbar-menu-tap="onMenuButtonTap_" |
| 89 spinner-active="[[toolbarSpinnerActive_]]" | 89 spinner-active="[[toolbarSpinnerActive_]]" |
| 90 menu-label="$i18n{menuButtonLabel}" | 90 menu-label="$i18n{menuButtonLabel}" |
| 91 on-search-changed="onSearchChanged_" | 91 on-search-changed="onSearchChanged_" |
| 92 role="none" | 92 role="none" |
| 93 show-menu> | 93 show-menu> |
| 94 </cr-toolbar> | 94 </cr-toolbar> |
| 95 <dialog id="drawer" is="cr-drawer"> | 95 <dialog id="drawer" is="cr-drawer" on-close="onMenuClosed_"> |
| 96 <div class="drawer-header" tabindex="-1">$i18n{settings}</div> | 96 <div class="drawer-header" tabindex="-1">$i18n{settings}</div> |
| 97 <div class="drawer-content"> | 97 <div class="drawer-content"> |
| 98 <template is="dom-if" id="drawerTemplate"> | 98 <template is="dom-if" id="drawerTemplate"> |
| 99 <settings-menu page-visibility="[[pageVisibility_]]" | 99 <settings-menu page-visibility="[[pageVisibility_]]" |
| 100 show-android-apps="[[showAndroidApps_]]" | 100 show-android-apps="[[showAndroidApps_]]" |
| 101 on-iron-activate="onIronActivate_" | 101 on-iron-activate="onIronActivate_" |
| 102 advanced-opened="{{advancedOpened_}}"> | 102 advanced-opened="{{advancedOpened_}}"> |
| 103 </settings-menu> | 103 </settings-menu> |
| 104 </template> | 104 </template> |
| 105 </div> | 105 </div> |
| 106 </dialog> | 106 </dialog> |
| 107 <div id="dropShadow"></div> | 107 <div id="dropShadow"></div> |
| 108 <div id="container"> | 108 <div id="container"> |
| 109 <!-- Used by IntersectionObserver, has a 0px height intentionally --> | 109 <!-- Used by IntersectionObserver, has a 0px height intentionally --> |
| 110 <div id="intersectionProbe"></div> | 110 <div id="intersectionProbe"></div> |
| 111 <settings-main id="main" prefs="{{prefs}}" | 111 <settings-main id="main" prefs="{{prefs}}" tabindex="-1" |
| 112 class="no-outline" |
| 112 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 113 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
| 113 page-visibility="[[pageVisibility_]]" | 114 page-visibility="[[pageVisibility_]]" |
| 114 show-android-apps="[[showAndroidApps_]]" | 115 show-android-apps="[[showAndroidApps_]]" |
| 115 advanced-toggle-expanded="{{advancedOpened_}}"> | 116 advanced-toggle-expanded="{{advancedOpened_}}"> |
| 116 </settings-main> | 117 </settings-main> |
| 117 </div> | 118 </div> |
| 118 </template> | 119 </template> |
| 119 <script src="settings_ui.js"></script> | 120 <script src="settings_ui.js"></script> |
| 120 </dom-module> | 121 </dom-module> |
| OLD | NEW |