[Smart Lock] Add a setting to require close proximity in order for unlocking to work.

chrome/browser/resources/options/browser_options.html

Index: chrome/browser/resources/options/browser_options.html
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index 06e9e36c3448ed2a4b7a62f1d24c662fe0e7eea7..aed7cc8b7b1d59be2e794320d6ce3788cb03c547 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -536,7 +536,7 @@
   <section id="easy-unlock-section" guest-visibility="hidden" hidden>
     <h3 i18n-content="easyUnlockSectionTitle"></h3>
     <!-- Options shown when the user has not set up Easy Unlock -->
-    <div id='easy-unlock-setup' hidden>
+    <div id="easy-unlock-setup" hidden>
       <div class="settings-row">
         <span i18n-content="easyUnlockSetupIntro"></span>
         <a target="_blank" i18n-content="learnMore"
@@ -546,11 +546,20 @@
           i18n-content="easyUnlockSetupButton"></button>
     </div>
     <!-- Options shown when the user has set up Easy Unlock -->
-    <div id='easy-unlock-enable' hidden>
+    <div id="easy-unlock-enable" hidden>
       <div class="settings-row">
         <span i18n-content="easyUnlockDescription"></span>
         <a target="_blank" i18n-content="learnMore"
-            i18n-values="href:easyUnlockLearnMoreURL"></a>
+           i18n-values="href:easyUnlockLearnMoreURL"></a>
+        <div id="easy-unlock-enable-proximity-detection" class="checkbox"
+             hidden>
+          <label>
+            <input type="checkbox"
+                   metric="Options_EasyUnlockRequireProximity"

[Evan Stade, 2014/11/05 22:24:16]

nit: wrong indentation (see rest of file)

[Ilya Sherman, 2014/11/05 22:40:58]

Done.

+                   pref="easy_unlock.proximity_required">
+            <span i18n-content="easyUnlockRequireProximityLabel"></span>
+          </label>
+        </div>
       </div>
       <button id="easy-unlock-turn-off-button"
           i18n-content="easyUnlockTurnOffButton"></button>