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

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: try to fix browser tests 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
Index: chrome/browser/resources/options/options.html
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index 350ebccc6a3ce514bd443d0cbad77926c1d6a7f8..b675898032efe805953819f390c2f4eb159e0a5d 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -3,6 +3,17 @@
<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/custom_elements.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">
@@ -62,6 +73,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">
@@ -140,6 +152,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>

Powered by Google App Engine
This is Rietveld 408576698