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 21 matching lines...) Expand all Loading... |
32 #include "content/public/browser/web_contents.h" | 32 #include "content/public/browser/web_contents.h" |
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/easy_unlock_settings_handler
.h" | 41 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler
.h" |
| 42 #include "chrome/browser/ui/webui/settings/chromeos/quick_unlock_handler.h" |
42 #else // !defined(OS_CHROMEOS) | 43 #else // !defined(OS_CHROMEOS) |
43 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" | 44 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" |
44 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" | 45 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" |
45 #include "chrome/browser/ui/webui/settings/system_handler.h" | 46 #include "chrome/browser/ui/webui/settings/system_handler.h" |
46 #endif // defined(OS_CHROMEOS) | 47 #endif // defined(OS_CHROMEOS) |
47 | 48 |
48 #if defined(USE_NSS_CERTS) | 49 #if defined(USE_NSS_CERTS) |
49 #include "chrome/browser/ui/webui/settings/certificates_handler.h" | 50 #include "chrome/browser/ui/webui/settings/certificates_handler.h" |
50 #elif defined(OS_WIN) || defined(OS_MACOSX) | 51 #elif defined(OS_WIN) || defined(OS_MACOSX) |
51 #include "chrome/browser/ui/webui/settings/native_certificates_handler.h" | 52 #include "chrome/browser/ui/webui/settings/native_certificates_handler.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 | 96 |
96 content::WebUIDataSource* html_source = | 97 content::WebUIDataSource* html_source = |
97 content::WebUIDataSource::Create(url.host()); | 98 content::WebUIDataSource::Create(url.host()); |
98 | 99 |
99 #if defined(OS_CHROMEOS) | 100 #if defined(OS_CHROMEOS) |
100 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler = | 101 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler = |
101 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source, | 102 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source, |
102 profile); | 103 profile); |
103 if (easy_unlock_handler) | 104 if (easy_unlock_handler) |
104 AddSettingsPageUIHandler(easy_unlock_handler); | 105 AddSettingsPageUIHandler(easy_unlock_handler); |
| 106 |
| 107 InitializeQuickUnlockForSettings(html_source); |
105 #endif | 108 #endif |
106 | 109 |
107 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); | 110 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); |
108 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); | 111 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); |
109 | 112 |
110 // Add all settings resources. | 113 // Add all settings resources. |
111 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { | 114 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { |
112 html_source->AddResourcePath(kSettingsResources[i].name, | 115 html_source->AddResourcePath(kSettingsResources[i].name, |
113 kSettingsResources[i].value); | 116 kSettingsResources[i].value); |
114 } | 117 } |
(...skipping 27 matching lines...) Expand all Loading... |
142 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", | 145 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", |
143 base::Time::Now() - load_start_time_); | 146 base::Time::Now() - load_start_time_); |
144 } | 147 } |
145 | 148 |
146 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { | 149 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { |
147 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", | 150 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", |
148 base::Time::Now() - load_start_time_); | 151 base::Time::Now() - load_start_time_); |
149 } | 152 } |
150 | 153 |
151 } // namespace settings | 154 } // namespace settings |
OLD | NEW |