Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 cr.define('options.search_engines', function() { | 5 cr.define('options.search_engines', function() { |
| 6 /** @const */ var ControlledSettingIndicator = | 6 /** @const */ var ControlledSettingIndicator = |
| 7 options.ControlledSettingIndicator; | 7 options.ControlledSettingIndicator; |
| 8 /** @const */ var InlineEditableItemList = options.InlineEditableItemList; | 8 /** @const */ var InlineEditableItemList = options.InlineEditableItemList; |
| 9 /** @const */ var InlineEditableItem = options.InlineEditableItem; | 9 /** @const */ var InlineEditableItem = options.InlineEditableItem; |
| 10 /** @const */ var ListSelectionController = cr.ui.ListSelectionController; | 10 /** @const */ var ListSelectionController = cr.ui.ListSelectionController; |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 92 // Construct the name column. | 92 // Construct the name column. |
| 93 var nameColEl = this.ownerDocument.createElement('div'); | 93 var nameColEl = this.ownerDocument.createElement('div'); |
| 94 nameColEl.className = 'name-column'; | 94 nameColEl.className = 'name-column'; |
| 95 nameColEl.classList.add('weakrtl'); | 95 nameColEl.classList.add('weakrtl'); |
| 96 this.contentElement.appendChild(nameColEl); | 96 this.contentElement.appendChild(nameColEl); |
| 97 | 97 |
| 98 // Add the favicon. | 98 // Add the favicon. |
| 99 var faviconDivEl = this.ownerDocument.createElement('div'); | 99 var faviconDivEl = this.ownerDocument.createElement('div'); |
| 100 faviconDivEl.className = 'favicon'; | 100 faviconDivEl.className = 'favicon'; |
| 101 if (!this.isPlaceholder) { | 101 if (!this.isPlaceholder) { |
| 102 faviconDivEl.style.backgroundImage = | 102 faviconDivEl.style.backgroundImage = getFaviconImageSet(engine.iconURL); |
| 103 url('chrome://favicon/iconurl@' + window.devicePixelRatio + 'x/' + | |
| 104 engine.iconURL); | |
|
kevers
2013/01/04 20:21:10
Has this change been thoroughly tested? It appears
pkotwicz
2013/01/04 21:21:39
Thanks for catching this Kevin! chrome://favicon/i
| |
| 105 } | 103 } |
| 106 nameColEl.appendChild(faviconDivEl); | 104 nameColEl.appendChild(faviconDivEl); |
| 107 | 105 |
| 108 var nameEl = this.createEditableTextCell(engine.displayName); | 106 var nameEl = this.createEditableTextCell(engine.displayName); |
| 109 nameEl.classList.add('weakrtl'); | 107 nameEl.classList.add('weakrtl'); |
| 110 nameColEl.appendChild(nameEl); | 108 nameColEl.appendChild(nameEl); |
| 111 | 109 |
| 112 // Then the keyword column. | 110 // Then the keyword column. |
| 113 var keywordEl = this.createEditableTextCell(engine.keyword); | 111 var keywordEl = this.createEditableTextCell(engine.keyword); |
| 114 keywordEl.className = 'keyword-column'; | 112 keywordEl.className = 'keyword-column'; |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 319 }, | 317 }, |
| 320 }; | 318 }; |
| 321 | 319 |
| 322 // Export | 320 // Export |
| 323 return { | 321 return { |
| 324 SearchEngineList: SearchEngineList | 322 SearchEngineList: SearchEngineList |
| 325 }; | 323 }; |
| 326 | 324 |
| 327 }); | 325 }); |
| 328 | 326 |
| OLD | NEW |