merge beta into mozilla-release, a=merge

mozilla · Nov 25, 2014 · f8ac6e3 · f8ac6e3
2 parents cf03b9b + cfcefec
commit f8ac6e3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
@@ -902,7 +902,7 @@
       <xul:hbox xbl:inherits="collapsed=showonlysettings" anonid="searchbar-engine"
                 class="search-panel-header search-panel-current-engine">
         <xul:image class="searchbar-engine-image" xbl:inherits="src"/>
-        <xul:label anonid="searchbar-engine-name"/>
+        <xul:label anonid="searchbar-engine-name" flex="1" crop="end"/>
       </xul:hbox>
       <xul:tree anonid="tree" flex="1"
                 class="autocomplete-tree plain search-panel-tree"

diff --git a/browser/components/preferences/search.css b/browser/components/preferences/search.css
@@ -20,6 +20,7 @@
 .checkbox-label-box {
   -moz-box-align: center;
   -moz-appearance: none;
+  border: none;
 }
 
 .checkbox-icon {

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
@@ -180,6 +180,7 @@
 @BINPATH@/components/autoconfig.xpt
 @BINPATH@/browser/components/browsercompsbase.xpt
 @BINPATH@/browser/components/browser-feeds.xpt
+@BINPATH@/browser/components/browsermodules.manifest
 @BINPATH@/components/caps.xpt
 @BINPATH@/components/chrome.xpt
 @BINPATH@/components/commandhandler.xpt

diff --git a/browser/locales/en-US/searchplugins/yahoo.xml b/browser/locales/en-US/searchplugins/yahoo.xml
@@ -15,10 +15,11 @@
   <Param name="appid"   value="ffd" />
   <Param name="command" value="{searchTerms}" />
 </Url>
-<Url type="text/html" method="GET" template="https://search.yahoo.com/search" resultdomain="yahoo.com">
+<Url type="text/html" method="GET" template="https://search.yahoo.com/yhs/search" resultdomain="yahoo.com">
   <Param name="p" value="{searchTerms}"/>
   <Param name="ei" value="UTF-8"/>
-  <MozParam name="fr" condition="pref" pref="yahoo-fr" />
+  <Param name="hspart" value="mozilla"/>
+  <Param name="hsimp" value="yhs-001"/>
 </Url>
 <SearchForm>https://search.yahoo.com/</SearchForm>
 </SearchPlugin>
diff --git a/browser/modules/modules.manifest → browser/modules/browsermodules.manifest b/browser/modules/modules.manifest → browser/modules/browsermodules.manifest
diff --git a/browser/modules/moz.build b/browser/modules/moz.build
@@ -50,7 +50,7 @@ EXTRA_PP_JS_MODULES += [
 ]
 
 EXTRA_PP_COMPONENTS += [
-    'modules.manifest',
+    'browsermodules.manifest',
 ]
 
 if CONFIG['MOZILLA_OFFICIAL']: