Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(414)

Side by Side Diff: chrome/browser/resources/options/browser_options.html

Issue 696583002: [Smart Lock] Add a setting to require close proximity in order for unlocking to work. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix more indentation Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <div id="settings" class="page" hidden> 1 <div id="settings" class="page" hidden>
2 <header> 2 <header>
3 <h1 i18n-content="settingsTitle"></h1> 3 <h1 i18n-content="settingsTitle"></h1>
4 </header> 4 </header>
5 <include src="reset_profile_settings_banner.html"> 5 <include src="reset_profile_settings_banner.html">
6 <include src="automatic_settings_reset_banner.html"> 6 <include src="automatic_settings_reset_banner.html">
7 <if expr="chromeos"> 7 <if expr="chromeos">
8 <include src="secondary_user_banner.html"> 8 <include src="secondary_user_banner.html">
9 <section> 9 <section>
10 <div id="network-section-header" class="section-header"> 10 <div id="network-section-header" class="section-header">
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 </a> 529 </a>
530 </div> 530 </div>
531 <if expr="is_macosx"> 531 <if expr="is_macosx">
532 <div id="mac-passwords-warning" i18n-content="macPasswordsWarning" hidden> 532 <div id="mac-passwords-warning" i18n-content="macPasswordsWarning" hidden>
533 </div> 533 </div>
534 </if> 534 </if>
535 </section> 535 </section>
536 <section id="easy-unlock-section" guest-visibility="hidden" hidden> 536 <section id="easy-unlock-section" guest-visibility="hidden" hidden>
537 <h3 i18n-content="easyUnlockSectionTitle"></h3> 537 <h3 i18n-content="easyUnlockSectionTitle"></h3>
538 <!-- Options shown when the user has not set up Easy Unlock --> 538 <!-- Options shown when the user has not set up Easy Unlock -->
539 <div id='easy-unlock-setup' hidden> 539 <div id="easy-unlock-setup" hidden>
540 <div class="settings-row"> 540 <div class="settings-row">
541 <span i18n-content="easyUnlockSetupIntro"></span> 541 <span i18n-content="easyUnlockSetupIntro"></span>
542 <a target="_blank" i18n-content="learnMore" 542 <a target="_blank" i18n-content="learnMore"
543 i18n-values="href:easyUnlockLearnMoreURL"></a> 543 i18n-values="href:easyUnlockLearnMoreURL"></a>
544 </div> 544 </div>
545 <button id="easy-unlock-setup-button" 545 <button id="easy-unlock-setup-button"
546 i18n-content="easyUnlockSetupButton"></button> 546 i18n-content="easyUnlockSetupButton"></button>
547 </div> 547 </div>
548 <!-- Options shown when the user has set up Easy Unlock --> 548 <!-- Options shown when the user has set up Easy Unlock -->
549 <div id='easy-unlock-enable' hidden> 549 <div id="easy-unlock-enable" hidden>
550 <div class="settings-row"> 550 <div class="settings-row">
551 <span i18n-content="easyUnlockDescription"></span> 551 <span i18n-content="easyUnlockDescription"></span>
552 <a target="_blank" i18n-content="learnMore" 552 <a target="_blank" i18n-content="learnMore"
553 i18n-values="href:easyUnlockLearnMoreURL"></a> 553 i18n-values="href:easyUnlockLearnMoreURL"></a>
554 <div id="easy-unlock-enable-proximity-detection" class="checkbox"
555 hidden>
556 <label>
557 <input type="checkbox"
558 metric="Options_EasyUnlockRequireProximity"
559 pref="easy_unlock.proximity_required">
560 <span i18n-content="easyUnlockRequireProximityLabel"></span>
561 </label>
562 </div>
554 </div> 563 </div>
555 <button id="easy-unlock-turn-off-button" 564 <button id="easy-unlock-turn-off-button"
556 i18n-content="easyUnlockTurnOffButton"></button> 565 i18n-content="easyUnlockTurnOffButton"></button>
557 </div> 566 </div>
558 </section> 567 </section>
559 <section id="web-content-section"> 568 <section id="web-content-section">
560 <h3 i18n-content="advancedSectionTitleContent"></h3> 569 <h3 i18n-content="advancedSectionTitleContent"></h3>
561 <div> 570 <div>
562 <div id="website-settings-section" class="settings-row" hidden> 571 <div id="website-settings-section" class="settings-row" hidden>
563 <button id="website-management-button" 572 <button id="website-management-button"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
957 </button> 966 </button>
958 </div> 967 </div>
959 </section> 968 </section>
960 </div> <!-- advanced-settings-container --> 969 </div> <!-- advanced-settings-container -->
961 </div> <!-- advanced-settings --> 970 </div> <!-- advanced-settings -->
962 <footer> 971 <footer>
963 <a is="action-link" id="advanced-settings-expander" 972 <a is="action-link" id="advanced-settings-expander"
964 i18n-content="showAdvancedSettings"></a> 973 i18n-content="showAdvancedSettings"></a>
965 </footer> 974 </footer>
966 </div> 975 </div>
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698