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

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

Issue 2787153002: MD Settings: Move easy unlock from people to lock screen. (Closed)
Patch Set: Closure. Created 3 years, 8 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
Index: chrome/browser/ui/webui/options/options_ui.cc
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index f82ca20dbdb951c95a32ba1c3131ce782885d150..4fea457622dfe58655f2621e87fbd252ca7f7bf7 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -139,6 +139,14 @@ constexpr char kLockScreenHTMLPath[] = "people_page/lock_screen.html";
constexpr char kLockScreenJSPath[] = "people_page/lock_screen.js";
constexpr char kSetupPinHTMLPath[] = "people_page/setup_pin_dialog.html";
constexpr char kSetupPinJSPath[] = "people_page/setup_pin_dialog.js";
+constexpr char kEasyUnlockBrowserProxyHTMLPath[] =
+ "people_page/easy_unlock_browser_proxy.html";
+constexpr char kEasyUnlockBrowserProxyJSPath[] =
+ "people_page/easy_unlock_browser_proxy.js";
+constexpr char kEasyUnlockTurnOffDialogHTMLPath[] =
+ "people_page/easy_unlock_turn_off_dialog.html";
+constexpr char kEasyUnlockTurnOffDialogJSPath[] =
+ "people_page/easy_unlock_turn_off_dialog.js";
constexpr char kFingerprintListHTMLPath[] = "people_page/fingerprint_list.html";
constexpr char kFingerprintListJSPath[] = "people_page/fingerprint_list.js";
constexpr char kSetupFingerprintHTMLPath[] =
@@ -311,6 +319,14 @@ void OptionsUIHTMLSource::CreateDataSourceMap() {
IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS;
path_to_idr_map_[kLockScreenHTMLPath] = IDR_OPTIONS_LOCK_SCREEN_HTML;
path_to_idr_map_[kLockScreenJSPath] = IDR_OPTIONS_LOCK_SCREEN_JS;
+ path_to_idr_map_[kEasyUnlockBrowserProxyHTMLPath] =
+ IDR_OPTIONS_EASY_UNLOCK_BROWSER_PROXY_HTML;
+ path_to_idr_map_[kEasyUnlockBrowserProxyJSPath] =
+ IDR_OPTIONS_EASY_UNLOCK_BROWSER_PROXY_JS;
+ path_to_idr_map_[kEasyUnlockTurnOffDialogHTMLPath] =
+ IDR_OPTIONS_EASY_UNLOCK_TURN_OFF_DIALOG_HTML;
+ path_to_idr_map_[kEasyUnlockTurnOffDialogJSPath] =
+ IDR_OPTIONS_EASY_UNLOCK_TURN_OFF_DIALOG_JS;
path_to_idr_map_[kSetupPinHTMLPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_HTML;
path_to_idr_map_[kSetupPinJSPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_JS;
path_to_idr_map_[kFingerprintListHTMLPath] =

Powered by Google App Engine
This is Rietveld 408576698