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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 889153004: [Cleanup] Clean up Easy Unlock code a bit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/signin/easy_unlock_service_signin_chromeos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 72b1c38a0d112c11e146178148ca5053acc781d3..cae3cba2d302f478e97446fcab1210cb6e3a38e1 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -2035,14 +2035,13 @@ void BrowserOptionsHandler::SetupManagingSupervisedUsers() {
}
void BrowserOptionsHandler::SetupEasyUnlock() {
+ // TODO(isherman): Is the below TODO still relevant?
// TODO(xiyuan): Update when pairing data is really availble.
Ilya Sherman 2015/02/05 02:27:50 Xiyuan, could you please clarify what you meant by
xiyuan 2015/02/05 03:30:09 The TODO could be removed. It is done. We were che
- const base::ListValue* devices =
- EasyUnlockService::Get(Profile::FromWebUI(web_ui()))->GetRemoteDevices();
- bool has_pairing = devices && !devices->empty();
- base::FundamentalValue has_pairing_value(has_pairing);
+ base::FundamentalValue is_enabled(
+ EasyUnlockService::Get(Profile::FromWebUI(web_ui()))->IsEnabled());
web_ui()->CallJavascriptFunction(
"BrowserOptions.updateEasyUnlock",
- has_pairing_value);
+ is_enabled);
}
void BrowserOptionsHandler::SetupExtensionControlledIndicators() {
« no previous file with comments | « chrome/browser/signin/easy_unlock_service_signin_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698