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

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

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: Rebase and update histograms.xml 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 cr.exportPath('options'); 5 cr.exportPath('options');
6 6
7 /** 7 /**
8 * @typedef {{actionLinkText: (string|undefined), 8 * @typedef {{actionLinkText: (string|undefined),
9 * hasError: (boolean|undefined), 9 * hasError: (boolean|undefined),
10 * hasUnrecoverableError: (boolean|undefined), 10 * hasUnrecoverableError: (boolean|undefined),
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 // Easy Unlock section. 534 // Easy Unlock section.
535 if (loadTimeData.getBoolean('easyUnlockAllowed')) { 535 if (loadTimeData.getBoolean('easyUnlockAllowed')) {
536 $('easy-unlock-section').hidden = false; 536 $('easy-unlock-section').hidden = false;
537 $('easy-unlock-setup-button').onclick = function(event) { 537 $('easy-unlock-setup-button').onclick = function(event) {
538 chrome.send('launchEasyUnlockSetup'); 538 chrome.send('launchEasyUnlockSetup');
539 }; 539 };
540 $('easy-unlock-turn-off-button').onclick = function(event) { 540 $('easy-unlock-turn-off-button').onclick = function(event) {
541 PageManager.showPageByName('easyUnlockTurnOffOverlay'); 541 PageManager.showPageByName('easyUnlockTurnOffOverlay');
542 }; 542 };
543 } 543 }
544 if (loadTimeData.getBoolean('easyUnlockProximityDetectionAllowed')) {
545 $('easy-unlock-enable-proximity-detection').hidden = false;
Evan Stade 2014/11/05 22:24:16 nit: foo.hidden = !condition;
Ilya Sherman 2014/11/05 22:40:58 Done.
546 }
544 547
545 // Website Settings section. 548 // Website Settings section.
546 if (loadTimeData.getBoolean('websiteSettingsManagerEnabled')) { 549 if (loadTimeData.getBoolean('websiteSettingsManagerEnabled')) {
547 $('website-settings-section').hidden = false; 550 $('website-settings-section').hidden = false;
548 $('website-management-button').onclick = function(event) { 551 $('website-management-button').onclick = function(event) {
549 PageManager.showPageByName('websiteSettings'); 552 PageManager.showPageByName('websiteSettings');
550 }; 553 };
551 } 554 }
552 555
553 // Web Content section. 556 // Web Content section.
(...skipping 1588 matching lines...) Expand 10 before | Expand all | Expand 10 after
2142 } 2145 }
2143 button.textContent = loadTimeData.getString(strId); 2146 button.textContent = loadTimeData.getString(strId);
2144 }; 2147 };
2145 } 2148 }
2146 2149
2147 // Export 2150 // Export
2148 return { 2151 return {
2149 BrowserOptions: BrowserOptions 2152 BrowserOptions: BrowserOptions
2150 }; 2153 };
2151 }); 2154 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698