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

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

Powered by Google App Engine
This is Rietveld 408576698