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

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

Issue 2150763002: Enable PIN configuration settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Rebase Created 4 years, 5 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 22 matching lines...) Expand all
33 #include "content/public/browser/web_ui.h" 33 #include "content/public/browser/web_ui.h"
34 #include "content/public/browser/web_ui_data_source.h" 34 #include "content/public/browser/web_ui_data_source.h"
35 #include "grit/settings_resources.h" 35 #include "grit/settings_resources.h"
36 #include "grit/settings_resources_map.h" 36 #include "grit/settings_resources_map.h"
37 37
38 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
39 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" 39 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
40 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" 40 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
41 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" 41 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h"
42 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h" 42 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h"
43 #include "chrome/browser/ui/webui/settings/chromeos/quick_unlock_handler.h"
43 #else // !defined(OS_CHROMEOS) 44 #else // !defined(OS_CHROMEOS)
44 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" 45 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
45 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" 46 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
46 #include "chrome/browser/ui/webui/settings/system_handler.h" 47 #include "chrome/browser/ui/webui/settings/system_handler.h"
47 #endif // defined(OS_CHROMEOS) 48 #endif // defined(OS_CHROMEOS)
48 49
49 #if defined(USE_NSS_CERTS) 50 #if defined(USE_NSS_CERTS)
50 #include "chrome/browser/ui/webui/settings/certificates_handler.h" 51 #include "chrome/browser/ui/webui/settings/certificates_handler.h"
51 #elif defined(OS_WIN) || defined(OS_MACOSX) 52 #elif defined(OS_WIN) || defined(OS_MACOSX)
52 #include "chrome/browser/ui/webui/settings/native_certificates_handler.h" 53 #include "chrome/browser/ui/webui/settings/native_certificates_handler.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 98
98 content::WebUIDataSource* html_source = 99 content::WebUIDataSource* html_source =
99 content::WebUIDataSource::Create(url.host()); 100 content::WebUIDataSource::Create(url.host());
100 101
101 #if defined(OS_CHROMEOS) 102 #if defined(OS_CHROMEOS)
102 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler = 103 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler =
103 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source, 104 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source,
104 profile); 105 profile);
105 if (easy_unlock_handler) 106 if (easy_unlock_handler)
106 AddSettingsPageUIHandler(easy_unlock_handler); 107 AddSettingsPageUIHandler(easy_unlock_handler);
108
109 InitializeQuickUnlockForSettings(html_source);
107 #endif 110 #endif
108 111
109 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); 112 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile));
110 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); 113 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile));
111 114
112 // Add all settings resources. 115 // Add all settings resources.
113 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { 116 for (size_t i = 0; i < kSettingsResourcesSize; ++i) {
114 html_source->AddResourcePath(kSettingsResources[i].name, 117 html_source->AddResourcePath(kSettingsResources[i].name,
115 kSettingsResources[i].value); 118 kSettingsResources[i].value);
116 } 119 }
(...skipping 27 matching lines...) Expand all
144 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 147 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
145 base::Time::Now() - load_start_time_); 148 base::Time::Now() - load_start_time_);
146 } 149 }
147 150
148 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 151 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
149 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 152 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
150 base::Time::Now() - load_start_time_); 153 base::Time::Now() - load_start_time_);
151 } 154 }
152 155
153 } // namespace settings 156 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698