No bug - Fix incorrect merge of changes from bug 818940, bug 859576, and bug 738818. a=me

This commit is contained in:
Frank Yan 2013-04-10 14:57:52 +01:00
parent 6b4df40a4f
commit 2b6feea287
2 changed files with 1 additions and 5 deletions

View File

@ -273,10 +273,6 @@ function setupSearchEngine()
if (searchEngineInfo && searchEngineInfo.image) {
logoElt.parentNode.hidden = false;
logoElt.src = searchEngineInfo.image;
#ifdef XP_MACOSX
if (searchEngineInfo.imageHD && !window.matchMedia("(max-resolution: 1dppx)").matches)
logoElt.src = searchEngineInfo.imageHD;
#endif
logoElt.alt = searchEngineName;
searchText.placeholder = "";
}

View File

@ -20,7 +20,7 @@ browser.jar:
content/browser/aboutDialog.css (content/aboutDialog.css)
content/browser/aboutRobots.xhtml (content/aboutRobots.xhtml)
content/browser/abouthome/aboutHome.xhtml (content/abouthome/aboutHome.xhtml)
* content/browser/abouthome/aboutHome.js (content/abouthome/aboutHome.js)
content/browser/abouthome/aboutHome.js (content/abouthome/aboutHome.js)
* content/browser/abouthome/aboutHome.css (content/abouthome/aboutHome.css)
content/browser/abouthome/noise.png (content/abouthome/noise.png)
content/browser/abouthome/snippet1.png (content/abouthome/snippet1.png)