| OLD | NEW |
| 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 profile); | 174 profile); |
| 175 if (easy_unlock_handler) | 175 if (easy_unlock_handler) |
| 176 AddSettingsPageUIHandler(base::WrapUnique(easy_unlock_handler)); | 176 AddSettingsPageUIHandler(base::WrapUnique(easy_unlock_handler)); |
| 177 | 177 |
| 178 AddSettingsPageUIHandler(base::WrapUnique( | 178 AddSettingsPageUIHandler(base::WrapUnique( |
| 179 chromeos::settings::DateTimeHandler::Create(html_source))); | 179 chromeos::settings::DateTimeHandler::Create(html_source))); |
| 180 | 180 |
| 181 AddSettingsPageUIHandler( | 181 AddSettingsPageUIHandler( |
| 182 base::MakeUnique<chromeos::settings::StylusHandler>()); | 182 base::MakeUnique<chromeos::settings::StylusHandler>()); |
| 183 html_source->AddBoolean( | 183 html_source->AddBoolean( |
| 184 "pinUnlockEnabled", | 184 "quickUnlockEnabled", |
| 185 chromeos::quick_unlock::IsPinEnabled(profile->GetPrefs())); | 185 chromeos::quick_unlock::IsPinEnabled(profile->GetPrefs())); |
| 186 html_source->AddBoolean("fingerprintUnlockEnabled", | 186 html_source->AddBoolean("fingerprintUnlockEnabled", |
| 187 chromeos::quick_unlock::IsFingerprintEnabled()); | 187 chromeos::quick_unlock::IsFingerprintEnabled()); |
| 188 html_source->AddBoolean("androidAppsAllowed", | 188 html_source->AddBoolean("androidAppsAllowed", |
| 189 arc::IsArcAllowedForProfile(profile) && | 189 arc::IsArcAllowedForProfile(profile) && |
| 190 !arc::IsArcOptInVerificationDisabled()); | 190 !arc::IsArcOptInVerificationDisabled()); |
| 191 | 191 |
| 192 // TODO(mash): Support Chrome power settings in Mash. crbug.com/644348 | 192 // TODO(mash): Support Chrome power settings in Mash. crbug.com/644348 |
| 193 bool enable_power_settings = | 193 bool enable_power_settings = |
| 194 !ash_util::IsRunningInMash() && | 194 !ash_util::IsRunningInMash() && |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", | 256 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", |
| 257 base::Time::Now() - load_start_time_); | 257 base::Time::Now() - load_start_time_); |
| 258 } | 258 } |
| 259 | 259 |
| 260 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { | 260 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { |
| 261 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", | 261 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", |
| 262 base::Time::Now() - load_start_time_); | 262 base::Time::Now() - load_start_time_); |
| 263 } | 263 } |
| 264 | 264 |
| 265 } // namespace settings | 265 } // namespace settings |
| OLD | NEW |