OLD | NEW |
1 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> |
2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/a
pp-drawer.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/a
pp-drawer.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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 spinner-active="[[toolbarSpinnerActive_]]" | 93 spinner-active="[[toolbarSpinnerActive_]]" |
94 menu-label="$i18n{menuButtonLabel}" | 94 menu-label="$i18n{menuButtonLabel}" |
95 on-search-changed="onSearchChanged_" | 95 on-search-changed="onSearchChanged_" |
96 show-menu> | 96 show-menu> |
97 </cr-toolbar> | 97 </cr-toolbar> |
98 <app-drawer swipe-open> | 98 <app-drawer swipe-open> |
99 <div class="drawer-header">$i18n{settings}</div> | 99 <div class="drawer-header">$i18n{settings}</div> |
100 <div class="drawer-content"> | 100 <div class="drawer-content"> |
101 <template is="dom-if" id="drawerTemplate"> | 101 <template is="dom-if" id="drawerTemplate"> |
102 <settings-menu page-visibility="[[pageVisibility_]]" | 102 <settings-menu page-visibility="[[pageVisibility_]]" |
| 103 show-android-apps="[[showAndroidApps_]]" |
103 on-iron-activate="onIronActivate_" | 104 on-iron-activate="onIronActivate_" |
104 advanced-opened="{{advancedOpened_}}"> | 105 advanced-opened="{{advancedOpened_}}"> |
105 </settings-menu> | 106 </settings-menu> |
106 </template> | 107 </template> |
107 </div> | 108 </div> |
108 </app-drawer> | 109 </app-drawer> |
109 <paper-header-panel id="headerPanel" mode="waterfall"> | 110 <paper-header-panel id="headerPanel" mode="waterfall"> |
110 <settings-main id="main" prefs="{{prefs}}" | 111 <settings-main id="main" prefs="{{prefs}}" |
111 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 112 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
112 page-visibility="[[pageVisibility_]]" | 113 page-visibility="[[pageVisibility_]]" |
| 114 show-android-apps="[[showAndroidApps_]]" |
113 advanced-toggle-expanded="{{advancedOpened_}}"> | 115 advanced-toggle-expanded="{{advancedOpened_}}"> |
114 </settings-main> | 116 </settings-main> |
115 </paper-header-panel> | 117 </paper-header-panel> |
116 </template> | 118 </template> |
117 <script src="settings_ui.js"></script> | 119 <script src="settings_ui.js"></script> |
118 </dom-module> | 120 </dom-module> |
OLD | NEW |