Bug 994093 - Provide toggle for Geolocation service (geo.enabled) in Privacy & Security preference pane. r=IanN, ui-r=Neil

suite/common/jar.mn

@@ -226,7 +226,7 @@ comm.jar:
    content/communicator/pref/pref-search.js                         (pref/pref-search.js)
    content/communicator/pref/pref-search.xul                        (pref/pref-search.xul)
    content/communicator/pref/pref-security.js                       (pref/pref-security.js)
-   content/communicator/pref/pref-security.xul                      (pref/pref-security.xul)
+*  content/communicator/pref/pref-security.xul                      (pref/pref-security.xul)
    content/communicator/pref/pref-smartupdate.js                    (pref/pref-smartupdate.js)
    content/communicator/pref/pref-smartupdate.xul                   (pref/pref-smartupdate.xul)
    content/communicator/pref/pref-spelling.js                       (pref/pref-spelling.js)

suite/common/pref/pref-security.xul

@@ -24,6 +24,11 @@
                   name="privacy.donottrackheader.value"
                   type="int"/>
 
+      <!-- Location Aware Browsing -->
+      <preference id="geo.enabled"
+                  name="geo.enabled"
+                  type="bool"/>
+
       <!-- Safe Browsing -->
       <preference id="browser.safebrowsing.malware.enabled"
                   name="browser.safebrowsing.malware.enabled"
@@ -42,15 +47,41 @@
                 label="&dntTellSites.label;"
                 accesskey="&dntTellSites.accesskey;"
                 preference="privacy.donottrackheader.enabled"/>
-      <radiogroup id="dntSelection" orient="vertical" class="indent"
+      <radiogroup id="dntSelection"
+                  class="indent"
                   preference="privacy.donottrackheader.value">
-        <radio id="dntNoTrack" value="1" label="&dntTrackingNotOkay.label;"
+        <radio id="dntNoTrack"
+               value="1"
+               label="&dntTrackingNotOkay.label;"
                accesskey="&dntTrackingNotOkay.accesskey;"/>
-        <radio id="dntDoTrack" value="0" label="&dntTrackingOkay.label;"
+        <radio id="dntDoTrack"
+               value="0"
+               label="&dntTrackingOkay.label;"
                accesskey="&dntTrackingOkay.accesskey;"/>
       </radiogroup>
     </groupbox>
 
+    <!-- REMOVE #ifndef once bug 903439 is fixed -->
+#ifndef RELEASE_BUILD
+    <!-- Location Aware Browsing -->
+    <groupbox id="geoLocationGroup">
+      <caption label="&geoLocation.label;"/>
+
+      <description>&geoIntro.label;</description>
+      <radiogroup id="geoSelection"
+                  preference="geo.enabled">
+        <radio id="geoEnabled"
+               value="true"
+               label="&geoEnabled.label;"
+               accesskey="&geoEnabled.accesskey;"/>
+        <radio id="geoDisabled"
+               value="false"
+               label="&geoDisabled.label;"
+               accesskey="&geoDisabled.accesskey;"/>
+      </radiogroup>
+    </groupbox>
+#endif
+
     <!-- Safe Browsing -->
     <groupbox id="safeBrowsingGroup">
       <caption label="&safeBrowsing.label;"/>

suite/locales/en-US/chrome/common/pref/pref-security.dtd

@@ -15,6 +15,13 @@
 <!ENTITY dntTrackingOkay.label            "I consent to being tracked">
 <!ENTITY dntTrackingOkay.accesskey        "c">
 
+<!ENTITY geoLocation.label                "Location Aware Browsing">
+<!ENTITY geoIntro.label                   "Websites may request more information about your current location.">
+
+<!ENTITY geoEnabled.label                 "Prompt me for permission if a request is made">
+<!ENTITY geoEnabled.accesskey             "m">
+<!ENTITY geoDisabled.label                "Disable this feature and deny all requests">
+<!ENTITY geoDisabled.accesskey            "D">
 
 <!-- LOCALIZATION NOTE (safeBrowsing.label, blockWebForgeries.label, blockAttackSites.label):
   The methods by which forged (phished) and attack sites will be detected by