| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 2 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 2 <link rel="import" href="chrome://resources/html/md_select_css.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/neon-animation/neon-ani
matable.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 7 <link rel="import" href="../controls/extension_controlled_indicator.html"> | 7 <link rel="import" href="../controls/extension_controlled_indicator.html"> |
| 8 <link rel="import" href="../controls/settings_toggle_button.html"> | 8 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 9 <link rel="import" href="../icons.html"> | 9 <link rel="import" href="../icons.html"> |
| 10 <link rel="import" href="../i18n_setup.html"> | 10 <link rel="import" href="../i18n_setup.html"> |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 <div class="settings-box continuation indented"> | 98 <div class="settings-box continuation indented"> |
| 99 <iron-icon icon="settings:warning"></iron-icon> | 99 <iron-icon icon="settings:warning"></iron-icon> |
| 100 <div inner-h-t-m-l="[[hotwordInfo_.errorMessage]]"></div> | 100 <div inner-h-t-m-l="[[hotwordInfo_.errorMessage]]"></div> |
| 101 </div> | 101 </div> |
| 102 </template> | 102 </template> |
| 103 | 103 |
| 104 <template is="dom-if" if="[[hotwordInfo_.historyEnabled]]"> | 104 <template is="dom-if" if="[[hotwordInfo_.historyEnabled]]"> |
| 105 <div class="settings-box two-line continuation indented" | 105 <div class="settings-box two-line continuation indented" |
| 106 on-tap="onManageAudioHistoryTap_" actionable> | 106 on-tap="onManageAudioHistoryTap_" actionable> |
| 107 <div class="start"> | 107 <div class="start"> |
| 108 <div> | 108 [[i18n('searchOkGoogleAudioHistoryLabel', |
| 109 [[i18n('searchOkGoogleAudioHistoryLabel', | 109 hotwordInfo_.userName)]] |
| 110 hotwordInfo_.userName)]] | 110 <div class="secondary" id="audioHistorySecondary"> |
| 111 </div> | |
| 112 <div class="secondary"> | |
| 113 $i18n{searchOkGoogleAudioHistorySubtext} | 111 $i18n{searchOkGoogleAudioHistorySubtext} |
| 114 </div> | 112 </div> |
| 115 </div> | 113 </div> |
| 116 <button class="icon-external" is="paper-icon-button-light"> | 114 <button class="icon-external" is="paper-icon-button-light" |
| 117 </button> | 115 aria-label="[[i18n('searchOkGoogleAudioHistoryLabel', |
| 116 hotwordInfo_.userName)]]" |
| 117 aria-describedby="audioHistorySecondary"></button> |
| 118 </div> | 118 </div> |
| 119 </template> | 119 </template> |
| 120 </template> | 120 </template> |
| 121 | 121 |
| 122 <!-- Manage search engines --> | 122 <!-- Manage search engines --> |
| 123 <div id="subpage-trigger" class="settings-box two-line" | 123 <div id="subpage-trigger" class="settings-box two-line" |
| 124 on-tap="onManageSearchEnginesTap_" actionable> | 124 on-tap="onManageSearchEnginesTap_" actionable> |
| 125 <div class="start"> | 125 <div class="start"> |
| 126 $i18n{searchEnginesManage} | 126 $i18n{searchEnginesManage} |
| 127 <div class="secondary"> | 127 <div class="secondary" id="manageSearchEnginesSecondary"> |
| 128 $i18n{searchEnginesManageDescription} | 128 $i18n{searchEnginesManageDescription} |
| 129 </div> | 129 </div> |
| 130 </div> | 130 </div> |
| 131 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 131 <button class="subpage-arrow" is="paper-icon-button-light" |
| 132 aria-label="$i18n{searchEnginesManage}" |
| 133 aria-describedby="manageSearchEnginesSecondary"></button> |
| 132 </div> | 134 </div> |
| 133 </neon-animatable> | 135 </neon-animatable> |
| 134 <template is="dom-if" route-path="/searchEngines"> | 136 <template is="dom-if" route-path="/searchEngines"> |
| 135 <settings-subpage | 137 <settings-subpage |
| 136 associated-control="[[$$('#subpage-trigger')]]" | 138 associated-control="[[$$('#subpage-trigger')]]" |
| 137 page-title="$i18n{searchEnginesManage}"> | 139 page-title="$i18n{searchEnginesManage}"> |
| 138 <settings-search-engines-page></settings-search-engines-page> | 140 <settings-search-engines-page></settings-search-engines-page> |
| 139 </settings-subpage> | 141 </settings-subpage> |
| 140 </template> | 142 </template> |
| 141 </settings-animated-pages> | 143 </settings-animated-pages> |
| 142 </template> | 144 </template> |
| 143 <script src="search_page.js"></script> | 145 <script src="search_page.js"></script> |
| 144 </dom-module> | 146 </dom-module> |
| OLD | NEW |