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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/options/options.html

Issue 2236213002: Add quick unlock Settings in options page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: incorporate comments from jdufault@ Created 4 years, 4 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
« chrome/browser/resources/chromeos/quick_unlock/pin_keyboard.html ('K') | « chrome/browser/resources/options/compiled_resources.gyp ('k') | chrome/browser/resources/options/options.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/options.html
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index b6a954119e98190e168ab567137c6c7b80cb1e7e..ef622f33b34574f9fed84857c2fe4abca92bb7fe 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -3,6 +3,27 @@
<head>
<meta charset="utf-8">
<title i18n-content="optionsPageTitle"></title>
+<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="chrome://resources/cr_elements/icons.html">
+<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper-radio-group.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/paper-radio-button.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
+<link rel="import" href="chrome://settings-frame/people_page/pin_keyboard.html">
+<link rel="import" href="chrome://settings-frame/route.html">
+<link rel="import" href="chrome://settings-frame/prefs/prefs_types.html">
+<link rel="import" href="chrome://settings-frame/settings_shared_css.html">
+<link rel="import" href="chrome://settings-frame/settings_vars_css.html">
+<link rel="import" href="chrome://settings-frame/prefs/prefs_behavior.html">
+<link rel="import" href="chrome://settings-frame/people_page/setup_pin_dialog.html">
+<link rel="import" href="chrome://settings-frame/people_page/password_prompt_dialog.html">
+<link rel="import" href="chrome://settings-frame/people_page/lock_state_behavior.html">
+<link rel="import" href="chrome://settings-frame/people_page/lock_screen.html">
+
<link rel="stylesheet" href="chrome://resources/css/bubble.css">
<link rel="stylesheet" href="chrome://resources/css/bubble_button.css">
<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
@@ -63,6 +84,7 @@
<link rel="stylesheet" href="chromeos/keyboard_overlay.css">
<link rel="stylesheet" href="chromeos/note_overlay.css">
<link rel="stylesheet" href="chromeos/pointer_overlay.css">
+<link rel="stylesheet" href="chromeos/quick_unlock_configure_overlay.css">
<link rel="stylesheet" href="chromeos/storage_clear_drive_cache_overlay.css">
<link rel="stylesheet" href="chromeos/storage_manager.css">
<link rel="stylesheet" href="factory_reset_overlay.css">
@@ -142,6 +164,7 @@
<include src="chromeos/note_overlay.html">
<include src="chromeos/pointer_overlay.html">
<include src="chromeos/power_overlay.html">
+ <include src="chromeos/quick_unlock_configure_overlay.html">
<include src="chromeos/storage_manager.html">
<include src="factory_reset_overlay.html">
</if>
« chrome/browser/resources/chromeos/quick_unlock/pin_keyboard.html ('K') | « chrome/browser/resources/options/compiled_resources.gyp ('k') | chrome/browser/resources/options/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698