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 18 matching lines...) Expand all Loading... |
29 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h" | 29 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h" |
30 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" | 30 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" |
31 #include "chrome/common/url_constants.h" | 31 #include "chrome/common/url_constants.h" |
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/chromeos/login/quick_unlock/quick_unlock_utils.h" |
39 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" | 40 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" |
40 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" | 41 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" |
41 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" | 42 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" |
42 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler
.h" | 43 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_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 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 html_source->AddBoolean("quickUnlockEnabled", |
| 110 chromeos::IsQuickUnlockEnabled()); |
107 #endif | 111 #endif |
108 | 112 |
109 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); | 113 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); |
110 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); | 114 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); |
111 | 115 |
112 // Add all settings resources. | 116 // Add all settings resources. |
113 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { | 117 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { |
114 html_source->AddResourcePath(kSettingsResources[i].name, | 118 html_source->AddResourcePath(kSettingsResources[i].name, |
115 kSettingsResources[i].value); | 119 kSettingsResources[i].value); |
116 } | 120 } |
(...skipping 27 matching lines...) Expand all Loading... |
144 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", | 148 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", |
145 base::Time::Now() - load_start_time_); | 149 base::Time::Now() - load_start_time_); |
146 } | 150 } |
147 | 151 |
148 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { | 152 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { |
149 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", | 153 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", |
150 base::Time::Now() - load_start_time_); | 154 base::Time::Now() - load_start_time_); |
151 } | 155 } |
152 | 156 |
153 } // namespace settings | 157 } // namespace settings |
OLD | NEW |