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

chrome/browser/resources/options/options.js

Index: chrome/browser/resources/options/options.js
===================================================================
--- chrome/browser/resources/options/options.js	(revision 204675)
+++ chrome/browser/resources/options/options.js	(working copy)
@@ -17,6 +17,9 @@
 var CreateProfileOverlay = options.CreateProfileOverlay;
 var EditDictionaryOverlay = cr.IsMac ? null : options.EditDictionaryOverlay;
 var FactoryResetOverlay = options.FactoryResetOverlay;
+<if expr="pp_ifdef('enable_google_now')">
+  var GeolocationOptions = options.GeolocationOptions;

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

nit: no indent

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

I'm keeping this one like this for consistency with the rest of the file.
On 2013/06/10 18:06:10, Evan Stade wrote:

[Evan Stade, 2013/06/10 20:35:03]

where in the rest of the file is there an if expr?

[robliao, 2013/06/10 20:58:29]

In this directory, options_bundle.js follows the <if ...> with a space style.
On 2013/06/10 20:35:03, Evan Stade wrote:

[Evan Stade, 2013/06/10 21:15:19]

doesn't mean you should propagate the bad style into this file.

[robliao, 2013/06/10 21:29:46]

I agree with you that the space is unnecessary. However, the goal of the style
guide is to make the code readable and uniform. Performing this change would
make the code less uniform. Given that this statement is readable, I'm inclined
to follow the style that's established in the options JS and HTML files.

If the space is unnecessary, this should be fixed in all files rather than
one-offing the fix in files here and there.

We can take this offline for further discussion if you wish.
On 2013/06/10 21:15:19, Evan Stade wrote:

[Evan Stade, 2013/06/10 21:51:39]

feel free to fix them all right now then. It's a matter of seconds to do it.

[robliao, 2013/06/10 22:04:17]

Indeed it's a matter of seconds, but best put into another changelist so it
doesn't clutter this one. I'll send one out after this commits.
On 2013/06/10 21:51:39, Evan Stade wrote:

+</if>
 var ManagedUserCreateConfirmOverlay = options.ManagedUserCreateConfirmOverlay;
 var ManagedUserLearnMoreOverlay = options.ManagedUserLearnMoreOverlay;
 var FontSettings = options.FontSettings;