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 12 matching lines...) Expand all Loading... |
23 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" | 23 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" |
24 #include "chrome/common/url_constants.h" | 24 #include "chrome/common/url_constants.h" |
25 #include "content/public/browser/web_contents.h" | 25 #include "content/public/browser/web_contents.h" |
26 #include "content/public/browser/web_ui.h" | 26 #include "content/public/browser/web_ui.h" |
27 #include "content/public/browser/web_ui_data_source.h" | 27 #include "content/public/browser/web_ui_data_source.h" |
28 #include "grit/settings_resources.h" | 28 #include "grit/settings_resources.h" |
29 #include "grit/settings_resources_map.h" | 29 #include "grit/settings_resources_map.h" |
30 | 30 |
31 #if defined(OS_CHROMEOS) | 31 #if defined(OS_CHROMEOS) |
32 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" | 32 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" |
| 33 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" |
33 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler
.h" | 34 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler
.h" |
34 #else // !defined(OS_CHROMEOS) | 35 #else // !defined(OS_CHROMEOS) |
35 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" | 36 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" |
36 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" | 37 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" |
37 #endif // defined(OS_CHROMEOS) | 38 #endif // defined(OS_CHROMEOS) |
38 | 39 |
39 namespace settings { | 40 namespace settings { |
40 | 41 |
41 SettingsPageUIHandler::SettingsPageUIHandler() { | 42 SettingsPageUIHandler::SettingsPageUIHandler() { |
42 } | 43 } |
(...skipping 16 matching lines...) Expand all Loading... |
59 AddSettingsPageUIHandler(new DownloadsHandler()); | 60 AddSettingsPageUIHandler(new DownloadsHandler()); |
60 AddSettingsPageUIHandler(new FontHandler(web_ui)); | 61 AddSettingsPageUIHandler(new FontHandler(web_ui)); |
61 AddSettingsPageUIHandler(new LanguagesHandler(web_ui)); | 62 AddSettingsPageUIHandler(new LanguagesHandler(web_ui)); |
62 AddSettingsPageUIHandler(new PeopleHandler(profile)); | 63 AddSettingsPageUIHandler(new PeopleHandler(profile)); |
63 AddSettingsPageUIHandler(new SearchEnginesHandler(profile)); | 64 AddSettingsPageUIHandler(new SearchEnginesHandler(profile)); |
64 AddSettingsPageUIHandler(new SiteSettingsHandler(profile)); | 65 AddSettingsPageUIHandler(new SiteSettingsHandler(profile)); |
65 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); | 66 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); |
66 | 67 |
67 #if defined(OS_CHROMEOS) | 68 #if defined(OS_CHROMEOS) |
68 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler()); | 69 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler()); |
| 70 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui)); |
69 #else | 71 #else |
70 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui)); | 72 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui)); |
71 AddSettingsPageUIHandler(new ManageProfileHandler(profile)); | 73 AddSettingsPageUIHandler(new ManageProfileHandler(profile)); |
72 #endif | 74 #endif |
73 | 75 |
74 content::WebUIDataSource* html_source = | 76 content::WebUIDataSource* html_source = |
75 content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost); | 77 content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost); |
76 | 78 |
77 #if defined(OS_CHROMEOS) | 79 #if defined(OS_CHROMEOS) |
78 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler = | 80 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler = |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", | 123 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", |
122 base::Time::Now() - load_start_time_); | 124 base::Time::Now() - load_start_time_); |
123 } | 125 } |
124 | 126 |
125 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { | 127 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { |
126 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", | 128 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", |
127 base::Time::Now() - load_start_time_); | 129 base::Time::Now() - load_start_time_); |
128 } | 130 } |
129 | 131 |
130 } // namespace settings | 132 } // namespace settings |
OLD | NEW |