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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_ui.cc

Issue 2387253002: cros: Added policies for screen unlock. (Closed)
Patch Set: Rebased. Created 4 years, 1 month 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler = 118 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler =
119 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source, 119 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source,
120 profile); 120 profile);
121 if (easy_unlock_handler) 121 if (easy_unlock_handler)
122 AddSettingsPageUIHandler(easy_unlock_handler); 122 AddSettingsPageUIHandler(easy_unlock_handler);
123 123
124 AddSettingsPageUIHandler( 124 AddSettingsPageUIHandler(
125 chromeos::settings::DateTimeHandler::Create(html_source)); 125 chromeos::settings::DateTimeHandler::Create(html_source));
126 126
127 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled()); 127 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled());
128 html_source->AddBoolean("quickUnlockEnabled", 128 html_source->AddBoolean("quickUnlockEnabled",
stevenjb 2016/11/03 18:23:03 pinUnlockEnabled
sammiequon 2016/11/03 20:36:39 Done.
129 chromeos::IsQuickUnlockEnabled()); 129 chromeos::IsPinUnlockEnabled(profile->GetPrefs()));
130 #endif 130 #endif
131 131
132 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); 132 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile));
133 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); 133 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile));
134 134
135 // Add all settings resources. 135 // Add all settings resources.
136 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { 136 for (size_t i = 0; i < kSettingsResourcesSize; ++i) {
137 html_source->AddResourcePath(kSettingsResources[i].name, 137 html_source->AddResourcePath(kSettingsResources[i].name,
138 kSettingsResources[i].value); 138 kSettingsResources[i].value);
139 } 139 }
(...skipping 27 matching lines...) Expand all
167 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 167 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
168 base::Time::Now() - load_start_time_); 168 base::Time::Now() - load_start_time_);
169 } 169 }
170 170
171 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 171 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
172 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 172 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
173 base::Time::Now() - load_start_time_); 173 base::Time::Now() - load_start_time_);
174 } 174 }
175 175
176 } // namespace settings 176 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698