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 |
11 #include "base/metrics/histogram_macros.h" | 11 #include "base/metrics/histogram_macros.h" |
12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/ui/webui/settings/about_handler.h" | 13 #include "chrome/browser/ui/webui/settings/about_handler.h" |
14 #include "chrome/browser/ui/webui/settings/appearance_handler.h" | 14 #include "chrome/browser/ui/webui/settings/appearance_handler.h" |
15 #include "chrome/browser/ui/webui/settings/downloads_handler.h" | 15 #include "chrome/browser/ui/webui/settings/downloads_handler.h" |
16 #include "chrome/browser/ui/webui/settings/font_handler.h" | 16 #include "chrome/browser/ui/webui/settings/font_handler.h" |
17 #include "chrome/browser/ui/webui/settings/languages_handler.h" | 17 #include "chrome/browser/ui/webui/settings/languages_handler.h" |
18 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h" | 18 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h" |
19 #include "chrome/browser/ui/webui/settings/people_handler.h" | 19 #include "chrome/browser/ui/webui/settings/people_handler.h" |
20 #include "chrome/browser/ui/webui/settings/profile_info_handler.h" | 20 #include "chrome/browser/ui/webui/settings/profile_info_handler.h" |
21 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h" | 21 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h" |
22 #include "chrome/browser/ui/webui/settings/search_engines_handler.h" | 22 #include "chrome/browser/ui/webui/settings/search_engines_handler.h" |
23 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler. h" | 23 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler. h" |
24 #include "chrome/browser/ui/webui/settings/settings_media_devices_selection_hand ler.h" | |
24 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" | 25 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" |
25 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h" | 26 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h" |
26 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" | 27 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" |
27 #include "chrome/common/url_constants.h" | 28 #include "chrome/common/url_constants.h" |
28 #include "content/public/browser/web_contents.h" | 29 #include "content/public/browser/web_contents.h" |
29 #include "content/public/browser/web_ui.h" | 30 #include "content/public/browser/web_ui.h" |
30 #include "content/public/browser/web_ui_data_source.h" | 31 #include "content/public/browser/web_ui_data_source.h" |
31 #include "grit/settings_resources.h" | 32 #include "grit/settings_resources.h" |
32 #include "grit/settings_resources_map.h" | 33 #include "grit/settings_resources_map.h" |
33 | 34 |
(...skipping 23 matching lines...) Expand all Loading... | |
57 | 58 |
58 #if defined(USE_NSS_CERTS) | 59 #if defined(USE_NSS_CERTS) |
59 AddSettingsPageUIHandler(new CertificatesHandler(false)); | 60 AddSettingsPageUIHandler(new CertificatesHandler(false)); |
60 #elif defined(OS_WIN) || defined(OS_MACOSX) | 61 #elif defined(OS_WIN) || defined(OS_MACOSX) |
61 AddSettingsPageUIHandler(new NativeCertificatesHandler()); | 62 AddSettingsPageUIHandler(new NativeCertificatesHandler()); |
62 #endif // defined(USE_NSS_CERTS) | 63 #endif // defined(USE_NSS_CERTS) |
63 | 64 |
64 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui)); | 65 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui)); |
65 AddSettingsPageUIHandler(new DownloadsHandler()); | 66 AddSettingsPageUIHandler(new DownloadsHandler()); |
66 AddSettingsPageUIHandler(new FontHandler(web_ui)); | 67 AddSettingsPageUIHandler(new FontHandler(web_ui)); |
68 AddSettingsPageUIHandler(new MediaDevicesSelectionHandler(web_ui)); | |
michaelpg
2016/06/07 16:03:30
nit: keep alphabetical
Finnur
2016/06/07 16:48:23
Done.
| |
67 AddSettingsPageUIHandler(new LanguagesHandler(web_ui)); | 69 AddSettingsPageUIHandler(new LanguagesHandler(web_ui)); |
68 AddSettingsPageUIHandler(new PeopleHandler(profile)); | 70 AddSettingsPageUIHandler(new PeopleHandler(profile)); |
69 AddSettingsPageUIHandler(new ProfileInfoHandler(profile)); | 71 AddSettingsPageUIHandler(new ProfileInfoHandler(profile)); |
70 AddSettingsPageUIHandler(new SearchEnginesHandler(profile)); | 72 AddSettingsPageUIHandler(new SearchEnginesHandler(profile)); |
71 AddSettingsPageUIHandler(new SiteSettingsHandler(profile)); | 73 AddSettingsPageUIHandler(new SiteSettingsHandler(profile)); |
72 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); | 74 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); |
73 | 75 |
74 #if defined(OS_CHROMEOS) | 76 #if defined(OS_CHROMEOS) |
75 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler()); | 77 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler()); |
76 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui)); | 78 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui)); |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
129 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", | 131 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", |
130 base::Time::Now() - load_start_time_); | 132 base::Time::Now() - load_start_time_); |
131 } | 133 } |
132 | 134 |
133 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { | 135 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { |
134 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", | 136 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", |
135 base::Time::Now() - load_start_time_); | 137 base::Time::Now() - load_start_time_); |
136 } | 138 } |
137 | 139 |
138 } // namespace settings | 140 } // namespace settings |
OLD | NEW |