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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
135 AddSettingsPageUIHandler( | 135 AddSettingsPageUIHandler( |
136 chromeos::settings::DateTimeHandler::Create(html_source)); | 136 chromeos::settings::DateTimeHandler::Create(html_source)); |
137 | 137 |
138 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled()); | 138 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled()); |
139 html_source->AddBoolean("pinUnlockEnabled", | 139 html_source->AddBoolean("pinUnlockEnabled", |
140 chromeos::IsPinUnlockEnabled(profile->GetPrefs())); | 140 chromeos::IsPinUnlockEnabled(profile->GetPrefs())); |
141 html_source->AddBoolean( | 141 html_source->AddBoolean( |
142 "androidAppsAllowed", | 142 "androidAppsAllowed", |
143 arc::ArcSessionManager::IsAllowedForProfile(profile) && | 143 arc::ArcSessionManager::IsAllowedForProfile(profile) && |
144 !arc::ArcSessionManager::IsOptInVerificationDisabled()); | 144 !arc::ArcSessionManager::IsOptInVerificationDisabled()); |
145 html_source->AddBoolean("fingerprintUnlockEnabled", | |
jdufault
2016/12/06 18:13:42
Move above "androidAppsAllowed" call so this is ne
sammiequon
2016/12/06 18:55:37
Done.
| |
146 chromeos::IsFingerprintUnlockEnabled()); | |
145 #endif | 147 #endif |
146 | 148 |
147 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); | 149 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); |
148 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); | 150 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); |
149 | 151 |
150 // Add all settings resources. | 152 // Add all settings resources. |
151 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { | 153 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { |
152 html_source->AddResourcePath(kSettingsResources[i].name, | 154 html_source->AddResourcePath(kSettingsResources[i].name, |
153 kSettingsResources[i].value); | 155 kSettingsResources[i].value); |
154 } | 156 } |
(...skipping 27 matching lines...) Expand all Loading... | |
182 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", | 184 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", |
183 base::Time::Now() - load_start_time_); | 185 base::Time::Now() - load_start_time_); |
184 } | 186 } |
185 | 187 |
186 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { | 188 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { |
187 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", | 189 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", |
188 base::Time::Now() - load_start_time_); | 190 base::Time::Now() - load_start_time_); |
189 } | 191 } |
190 | 192 |
191 } // namespace settings | 193 } // namespace settings |
OLD | NEW |