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

chrome/browser/resources/options/options_bundle.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file exists to aggregate all of the javascript used by the
 // settings page into a single file which will be flattened and served
 // as a single resource.
 <include src="preferences.js"></include>
 <include src="controlled_setting.js"></include>
 <include src="deletable_item_list.js"></include>
@@ skipping 26 matching lines @@
   var DetailsInternetPage = options.internet.DetailsInternetPage;
   var DisplayOptions = options.DisplayOptions;
   var DisplayOverscan = options.DisplayOverscan;
   var BluetoothOptions = options.BluetoothOptions;
   var BluetoothPairing = options.BluetoothPairing;
   var KeyboardOverlay = options.KeyboardOverlay;
   var PointerOverlay = options.PointerOverlay;
   var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
 </if>
 <if expr="pp_ifdef('use_nss')">
   <include src="certificate_tree.js"></include>

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

hmmm... IMO the indent is wrong in this file. <if expr> doesn't imply its
contents should be indented. But I won't demand you change it right now. Would
be nice though.

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

No changes for consistency.

   <include src="certificate_manager.js"></include>
   <include src="certificate_restore_overlay.js"></include>
   <include src="certificate_backup_overlay.js"></include>
   <include src="certificate_edit_ca_trust_overlay.js"></include>
   <include src="certificate_import_error_overlay.js"></include>
   var CertificateManager = options.CertificateManager;
   var CertificateRestoreOverlay = options.CertificateRestoreOverlay;
   var CertificateBackupOverlay = options.CertificateBackupOverlay;
   var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay;
   var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay;
 </if>
 <include src="alert_overlay.js"></include>
 <include src="autofill_edit_address_overlay.js"></include>
 <include src="autofill_edit_creditcard_overlay.js"></include>
 <include src="autofill_options_list.js"></include>
 <include src="autofill_options.js"></include>
 <include src="browser_options.js"></include>
 <include src="browser_options_profile_list.js"></include>
 <include src="browser_options_startup_page_list.js"></include>
 <include src="clear_browser_data_overlay.js"></include>
 <include src="confirm_dialog.js"></include>
 <include src="content_settings.js"></include>
 <include src="content_settings2.js"></include>
 <include src="content_settings_exceptions_area.js"></include>
 <include src="content_settings_ui.js"></include>
 <include src="cookies_list.js"></include>
 <include src="cookies_view.js"></include>
 <include src="factory_reset_overlay.js"></include>
 <include src="font_settings.js"></include>
+<if expr="pp_ifdef('enable_google_now')">
+  <include src="geolocation_options.js"></include>
+</if>
 <include src="handler_options.js"></include>
 <include src="handler_options_list.js"></include>
 <include src="home_page_overlay.js"></include>
 <include src="import_data_overlay.js"></include>
 <include src="language_add_language_overlay.js"></include>
 <if expr="not is_macosx">
   <include src="language_dictionary_overlay_word_list.js"></include>
   <include src="language_dictionary_overlay.js"></include>
 </if>
 <include src="language_list.js"></include>
@@ skipping 11 matching lines @@
 <include src="search_engine_manager.js"></include>
 <include src="search_engine_manager_engine_list.js"></include>
 <include src="search_page.js"></include>
 <include src="startup_overlay.js"></include>
 <include src="../sync_setup_overlay.js"></include>
 <include src="../uber/uber_utils.js"></include>
 <include src="options.js"></include>
 <if expr="pp_ifdef('enable_settings_app')">
   <include src="options_settings_app.js"></include>
 </if>