OLD | NEW |
1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
2 | 2 |
3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in
dicator.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in
dicator.html"> |
4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
5 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 5 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
9 <link rel="import" href="../controls/extension_controlled_indicator.html"> | 9 <link rel="import" href="../controls/extension_controlled_indicator.html"> |
10 <link rel="import" href="../controls/settings_toggle_button.html"> | 10 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 11 <link rel="import" href="../google_assistant_page/google_assistant_page.html"> |
| 12 <link rel="import" href="../google_assistant_page/google_assistant_browser_proxy
.html"> |
11 <link rel="import" href="../icons.html"> | 13 <link rel="import" href="../icons.html"> |
12 <link rel="import" href="../i18n_setup.html"> | 14 <link rel="import" href="../i18n_setup.html"> |
13 <link rel="import" href="../route.html"> | 15 <link rel="import" href="../route.html"> |
14 <link rel="import" href="../search_engines_page/search_engines_page.html"> | 16 <link rel="import" href="../search_engines_page/search_engines_page.html"> |
15 <link rel="import" href="../search_engines_page/search_engines_browser_proxy.htm
l"> | 17 <link rel="import" href="../search_engines_page/search_engines_browser_proxy.htm
l"> |
16 <link rel="import" href="../settings_page/settings_animated_pages.html"> | 18 <link rel="import" href="../settings_page/settings_animated_pages.html"> |
17 <link rel="import" href="../settings_page/settings_subpage.html"> | 19 <link rel="import" href="../settings_page/settings_subpage.html"> |
18 <link rel="import" href="../settings_shared_css.html"> | 20 <link rel="import" href="../settings_shared_css.html"> |
19 <link rel="import" href="../settings_vars_css.html"> | 21 <link rel="import" href="../settings_vars_css.html"> |
20 | 22 |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 | 138 |
137 <!-- Manage search engines --> | 139 <!-- Manage search engines --> |
138 <div id="subpage-trigger" class="settings-box" | 140 <div id="subpage-trigger" class="settings-box" |
139 on-tap="onManageSearchEnginesTap_" actionable> | 141 on-tap="onManageSearchEnginesTap_" actionable> |
140 <div class="start"> | 142 <div class="start"> |
141 $i18n{searchEnginesManage} | 143 $i18n{searchEnginesManage} |
142 </div> | 144 </div> |
143 <button class="subpage-arrow" is="paper-icon-button-light" | 145 <button class="subpage-arrow" is="paper-icon-button-light" |
144 aria-label="$i18n{searchEnginesManage}"></button> | 146 aria-label="$i18n{searchEnginesManage}"></button> |
145 </div> | 147 </div> |
| 148 |
| 149 <if expr="chromeos"> |
| 150 <!-- Google Assistant --> |
| 151 <template is="dom-if" if="[[voiceInteractionFeatureEnabled_]]"> |
| 152 <div id="subpage-trigger" class="settings-box two-line" |
| 153 on-tap="onGoogleAssistantTap_" actionable> |
| 154 <div class="start"> |
| 155 $i18n{searchGoogleAssistant} |
| 156 <div class="secondary" id="googleAssistantSecondary"> |
| 157 [[getAssistantEnabledDisabledLabel_( |
| 158 prefs.settings.voice_interaction.enabled.value)]] |
| 159 </div> |
| 160 </div> |
| 161 <button class="subpage-arrow" is="paper-icon-button-light" |
| 162 aria-label="$i18n{searchEnginesManage}"></button> |
| 163 </div> |
| 164 </template> |
| 165 </if> |
146 </neon-animatable> | 166 </neon-animatable> |
147 <template is="dom-if" route-path="/searchEngines"> | 167 <template is="dom-if" route-path="/searchEngines"> |
148 <settings-subpage | 168 <settings-subpage |
149 associated-control="[[$$('#subpage-trigger')]]" | 169 associated-control="[[$$('#subpage-trigger')]]" |
150 page-title="$i18n{searchEnginesManage}"> | 170 page-title="$i18n{searchEnginesManage}"> |
151 <settings-search-engines-page></settings-search-engines-page> | 171 <settings-search-engines-page></settings-search-engines-page> |
152 </settings-subpage> | 172 </settings-subpage> |
153 </template> | 173 </template> |
| 174 <if expr="chromeos"> |
| 175 <template is="dom-if" if="[[voiceInteractionFeatureEnabled_]]"> |
| 176 <template is="dom-if" route-path="/googleAssistant"> |
| 177 <settings-subpage |
| 178 associated-control="[[$$('#subpage-trigger')]]" |
| 179 page-title="$i18n{googleAssistantPageTitle}"> |
| 180 <settings-google-assistant-page prefs="{{prefs}}"> |
| 181 </settings-google-assistant-page> |
| 182 </settings-subpage> |
| 183 </template> |
| 184 </template> |
| 185 </if> |
154 </settings-animated-pages> | 186 </settings-animated-pages> |
155 </template> | 187 </template> |
156 <script src="search_page.js"></script> | 188 <script src="search_page.js"></script> |
157 </dom-module> | 189 </dom-module> |
OLD | NEW |