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

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: Rebased. 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 profile); 146 profile);
147 if (easy_unlock_handler) 147 if (easy_unlock_handler)
148 AddSettingsPageUIHandler(base::WrapUnique(easy_unlock_handler)); 148 AddSettingsPageUIHandler(base::WrapUnique(easy_unlock_handler));
149 149
150 AddSettingsPageUIHandler(base::WrapUnique( 150 AddSettingsPageUIHandler(base::WrapUnique(
151 chromeos::settings::DateTimeHandler::Create(html_source))); 151 chromeos::settings::DateTimeHandler::Create(html_source)));
152 152
153 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled()); 153 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled());
154 html_source->AddBoolean("pinUnlockEnabled", 154 html_source->AddBoolean("pinUnlockEnabled",
155 chromeos::IsPinUnlockEnabled(profile->GetPrefs())); 155 chromeos::IsPinUnlockEnabled(profile->GetPrefs()));
156 html_source->AddBoolean("fingerprintUnlockEnabled",
157 chromeos::IsFingerprintUnlockEnabled());
156 html_source->AddBoolean( 158 html_source->AddBoolean(
157 "androidAppsAllowed", 159 "androidAppsAllowed",
158 arc::ArcSessionManager::IsAllowedForProfile(profile) && 160 arc::ArcSessionManager::IsAllowedForProfile(profile) &&
159 !arc::ArcSessionManager::IsOptInVerificationDisabled()); 161 !arc::ArcSessionManager::IsOptInVerificationDisabled());
160 162
161 // TODO(mash): Support Chrome power settings in Mash. crbug.com/644348 163 // TODO(mash): Support Chrome power settings in Mash. crbug.com/644348
162 bool enable_power_settings = 164 bool enable_power_settings =
163 !chrome::IsRunningInMash() && 165 !chrome::IsRunningInMash() &&
164 (switches::PowerOverlayEnabled() || 166 (switches::PowerOverlayEnabled() ||
165 (ash::PowerStatus::Get()->IsBatteryPresent() && 167 (ash::PowerStatus::Get()->IsBatteryPresent() &&
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 216 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
215 base::Time::Now() - load_start_time_); 217 base::Time::Now() - load_start_time_);
216 } 218 }
217 219
218 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 220 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
219 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 221 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
220 base::Time::Now() - load_start_time_); 222 base::Time::Now() - load_start_time_);
221 } 223 }
222 224
223 } // namespace settings 225 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698