Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
| 2 <link rel="import" href="chrome://md-settings/search_engines_page/search_engine_ dialog.html"> | |
| 3 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _browser_proxy.html"> | |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-dropdown/iron-drop down.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-dropdown/iron-drop down.html"> |
| 3 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _browser_proxy.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> | |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h tml"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h tml"> |
| 6 <link rel="import" href="chrome://md-settings/search_engines_page/search_engine_ dialog.html"> | |
| 7 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> | 9 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> |
| 8 | 10 |
| 9 <dom-module id="settings-search-engine-entry"> | 11 <dom-module id="settings-search-engine-entry"> |
| 10 <link rel="import" type="css" href="chrome://md-settings/search_engines_page/s earch_engine_entry.css"> | 12 <link rel="import" type="css" href="chrome://md-settings/search_engines_page/s earch_engine_entry.css"> |
| 11 <template> | 13 <template> |
| 12 <style include="settings-shared"></style> | 14 <style include="settings-shared"></style> |
| 13 <template is="dom-if" if="[[showEditSearchEngineDialog_]]" restamp> | 15 <template is="dom-if" if="[[showEditSearchEngineDialog_]]" restamp> |
| 14 <settings-search-engine-dialog model="[[engine]]"> | 16 <settings-search-engine-dialog model="[[engine]]"> |
| 15 </settings-search-engine-dialog> | 17 </settings-search-engine-dialog> |
| 16 </template> | 18 </template> |
| 17 <div id="container" class="list-item"> | 19 <div id="container" class="list-item"> |
| 18 <div class="name-column"> | 20 <div class="name-column"> |
| 19 <span class="icon-container"> | 21 <span class="icon-container"> |
| 20 <iron-icon src="[[engine.iconURL]]"></iron-icon> | 22 <template is="dom-if" if="[[engine.iconURL]]"> |
| 23 <iron-icon src="[[engine.iconURL]]"></iron-icon> | |
| 24 </template> | |
| 25 <template is="dom-if" if="[[!engine.iconURL]]"> | |
| 26 <iron-icon icon="icons:find-in-page"></iron-icon> | |
| 27 </template> | |
| 21 </span> | 28 </span> |
| 22 <div class="name">[[engine.displayName]]</div> | 29 <span class="name">[[engine.displayName]]</span> |
|
Dan Beam
2016/02/23 23:11:15
wait, does this change to a computed display: inli
dpapad
2016/02/23 23:25:54
The "name-column" div is not having display:flex a
| |
| 23 </div> | 30 </div> |
| 24 <div class="keyword-column">[[engine.keyword]]</div> | 31 <div class="keyword-column">[[engine.keyword]]</div> |
| 25 <div class="url-column">[[engine.url]]</div> | 32 <div class="url-column">[[engine.url]]</div> |
| 26 <div class="icon-container"> | |
| 27 <paper-icon-button icon="more-vert" toggles active="{{editMenuOpened}}"> | 33 <paper-icon-button icon="more-vert" toggles active="{{editMenuOpened}}"> |
| 28 </paper-icon-button> | 34 </paper-icon-button> |
| 29 <iron-dropdown opened="{{editMenuOpened}}" horizontal-align="right" | 35 <iron-dropdown opened="{{editMenuOpened}}" horizontal-align="right" |
| 30 vertical-align="top"> | 36 vertical-align="top"> |
| 31 <div class="dropdown-content"> | 37 <div class="dropdown-content"> |
| 32 <paper-item on-tap="onMakeDefaultTap_" | 38 <paper-item on-tap="onMakeDefaultTap_" |
| 33 i18n-content="searchEnginesMakeDefault" | 39 i18n-content="searchEnginesMakeDefault" |
| 34 hidden="[[engine.default]]" id="makeDefault"></paper-item> | 40 hidden="[[engine.default]]" id="makeDefault"></paper-item> |
| 35 <paper-item on-tap="onEditTap_" | 41 <paper-item on-tap="onEditTap_" |
| 36 i18n-content="searchEnginesEdit" id="edit"></paper-item> | 42 i18n-content="searchEnginesEdit" id="edit"></paper-item> |
| 37 <paper-item on-tap="onDeleteTap_" | 43 <paper-item on-tap="onDeleteTap_" |
| 38 i18n-content="searchEnginesRemoveFromList" | 44 i18n-content="searchEnginesRemoveFromList" |
| 39 hidden="[[engine.default]]" id="delete"></paper-item> | 45 hidden="[[engine.default]]" id="delete"></paper-item> |
| 40 <div> | 46 <div> |
| 41 </iron-dropdown> | 47 </iron-dropdown> |
| 42 </div> | |
| 43 </div> | 48 </div> |
| 44 </template> | 49 </template> |
| 45 <script src="search_engine_entry.js"></script> | 50 <script src="search_engine_entry.js"></script> |
| 46 </dom-module> | 51 </dom-module> |
| OLD | NEW |