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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_ui.cc

Issue 2538303002: md-settings: Added settings for fingerprint unlock. (Closed)
Patch Set: Fixed patch set 1 errors. Created 4 years 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "chrome/browser/ui/webui/settings/md_settings_ui.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_ui.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 profile); 128 profile);
129 if (easy_unlock_handler) 129 if (easy_unlock_handler)
130 AddSettingsPageUIHandler(easy_unlock_handler); 130 AddSettingsPageUIHandler(easy_unlock_handler);
131 131
132 AddSettingsPageUIHandler( 132 AddSettingsPageUIHandler(
133 chromeos::settings::DateTimeHandler::Create(html_source)); 133 chromeos::settings::DateTimeHandler::Create(html_source));
134 134
135 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled()); 135 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled());
136 html_source->AddBoolean("pinUnlockEnabled", 136 html_source->AddBoolean("pinUnlockEnabled",
137 chromeos::IsPinUnlockEnabled(profile->GetPrefs())); 137 chromeos::IsPinUnlockEnabled(profile->GetPrefs()));
138 html_source->AddBoolean("fingerprintUnlockEnabled",
139 chromeos::IsFingerprintUnlockEnabled());
138 #endif 140 #endif
139 141
140 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); 142 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile));
141 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); 143 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile));
142 144
143 // Add all settings resources. 145 // Add all settings resources.
144 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { 146 for (size_t i = 0; i < kSettingsResourcesSize; ++i) {
145 html_source->AddResourcePath(kSettingsResources[i].name, 147 html_source->AddResourcePath(kSettingsResources[i].name,
146 kSettingsResources[i].value); 148 kSettingsResources[i].value);
147 } 149 }
(...skipping 27 matching lines...) Expand all
175 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 177 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
176 base::Time::Now() - load_start_time_); 178 base::Time::Now() - load_start_time_);
177 } 179 }
178 180
179 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 181 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
180 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 182 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
181 base::Time::Now() - load_start_time_); 183 base::Time::Now() - load_start_time_);
182 } 184 }
183 185
184 } // namespace settings 186 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698