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

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: Modified the flags. Created 3 years, 11 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 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 profile); 132 profile);
133 if (easy_unlock_handler) 133 if (easy_unlock_handler)
134 AddSettingsPageUIHandler(easy_unlock_handler); 134 AddSettingsPageUIHandler(easy_unlock_handler);
135 135
136 AddSettingsPageUIHandler( 136 AddSettingsPageUIHandler(
137 chromeos::settings::DateTimeHandler::Create(html_source)); 137 chromeos::settings::DateTimeHandler::Create(html_source));
138 138
139 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled()); 139 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled());
140 html_source->AddBoolean("pinUnlockEnabled", 140 html_source->AddBoolean("pinUnlockEnabled",
141 chromeos::IsPinUnlockEnabled(profile->GetPrefs())); 141 chromeos::IsPinUnlockEnabled(profile->GetPrefs()));
142 html_source->AddBoolean("fingerprintUnlockEnabled",
143 chromeos::IsFingerprintUnlockEnabled());
142 html_source->AddBoolean( 144 html_source->AddBoolean(
143 "androidAppsAllowed", 145 "androidAppsAllowed",
144 arc::ArcSessionManager::IsAllowedForProfile(profile) && 146 arc::ArcSessionManager::IsAllowedForProfile(profile) &&
145 !arc::ArcSessionManager::IsOptInVerificationDisabled()); 147 !arc::ArcSessionManager::IsOptInVerificationDisabled());
146 #endif 148 #endif
147 149
148 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); 150 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile));
149 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); 151 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile));
150 152
151 // Add the metrics handler to write uma stats. 153 // Add the metrics handler to write uma stats.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 187 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
186 base::Time::Now() - load_start_time_); 188 base::Time::Now() - load_start_time_);
187 } 189 }
188 190
189 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 191 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
190 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 192 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
191 base::Time::Now() - load_start_time_); 193 base::Time::Now() - load_start_time_);
192 } 194 }
193 195
194 } // namespace settings 196 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698