Add a Preference for Google Services to Use the User's Location

chrome/browser/resources/options/content_settings.html

Index: chrome/browser/resources/options/content_settings.html
===================================================================
--- chrome/browser/resources/options/content_settings.html	(revision 204675)
+++ chrome/browser/resources/options/content_settings.html	(working copy)
@@ -285,6 +285,24 @@
             </span>
           </span>
         </div>
+        <if expr="pp_ifdef('enable_google_now')">

[Evan Stade, 2013/06/10 18:06:10]

if expr should not be indented at all (like #ifdef)

[robliao, 2013/06/10 18:58:49]

Done.

+          <div class="checkbox" id="geolocationCheckbox" hidden>
+            <span class="controlled-setting-with-label">
+              <input id="googleGeolocationAccessEnabled"
+                  pref="googlegeolocationaccess.enabled"
+                  metric="Options_GoogleGeolocationAccessCheckbox"
+                  type="checkbox">
+              <span>
+                <label for="googleGeolocationAccessEnabled"
+                    i18n-content="googleGeolocationAccessEnable">
+                </label>
+                <span class="controlled-setting-indicator"
+                    pref="googlegeolocationaccess.enabled">
+                </span>
+              </span>
+            </span>
+          </div>
+        </if>
         <div class="settings-row">
           <button class="exceptions-list-button" contentType="location"
               i18n-content="manageExceptions"></button>