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

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

Issue 2480543002: MD Settings: Copy Import Bookmarks handler to MD Settings (Closed)
Patch Set: restore old formatting for ease of review Created 4 years, 1 month 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
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/browser_lifetime_handler.h" 15 #include "chrome/browser/ui/webui/settings/browser_lifetime_handler.h"
16 #include "chrome/browser/ui/webui/settings/downloads_handler.h" 16 #include "chrome/browser/ui/webui/settings/downloads_handler.h"
17 #include "chrome/browser/ui/webui/settings/font_handler.h" 17 #include "chrome/browser/ui/webui/settings/font_handler.h"
18 #include "chrome/browser/ui/webui/settings/languages_handler.h" 18 #include "chrome/browser/ui/webui/settings/languages_handler.h"
19 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h" 19 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
20 #include "chrome/browser/ui/webui/settings/metrics_reporting_handler.h" 20 #include "chrome/browser/ui/webui/settings/metrics_reporting_handler.h"
21 #include "chrome/browser/ui/webui/settings/people_handler.h" 21 #include "chrome/browser/ui/webui/settings/people_handler.h"
22 #include "chrome/browser/ui/webui/settings/profile_info_handler.h" 22 #include "chrome/browser/ui/webui/settings/profile_info_handler.h"
23 #include "chrome/browser/ui/webui/settings/protocol_handlers_handler.h" 23 #include "chrome/browser/ui/webui/settings/protocol_handlers_handler.h"
24 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h" 24 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h"
25 #include "chrome/browser/ui/webui/settings/search_engines_handler.h" 25 #include "chrome/browser/ui/webui/settings/search_engines_handler.h"
26 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler. h" 26 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler. h"
27 #include "chrome/browser/ui/webui/settings/settings_cookies_view_handler.h" 27 #include "chrome/browser/ui/webui/settings/settings_cookies_view_handler.h"
28 #include "chrome/browser/ui/webui/settings/settings_import_data_handler.h"
28 #include "chrome/browser/ui/webui/settings/settings_media_devices_selection_hand ler.h" 29 #include "chrome/browser/ui/webui/settings/settings_media_devices_selection_hand ler.h"
29 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" 30 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
30 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h" 31 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h"
31 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" 32 #include "chrome/browser/ui/webui/settings/site_settings_handler.h"
32 #include "chrome/common/url_constants.h" 33 #include "chrome/common/url_constants.h"
33 #include "chrome/grit/settings_resources.h" 34 #include "chrome/grit/settings_resources.h"
34 #include "chrome/grit/settings_resources_map.h" 35 #include "chrome/grit/settings_resources_map.h"
35 #include "content/public/browser/web_contents.h" 36 #include "content/public/browser/web_contents.h"
36 #include "content/public/browser/web_ui.h" 37 #include "content/public/browser/web_ui.h"
37 #include "content/public/browser/web_ui_data_source.h" 38 #include "content/public/browser/web_ui_data_source.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 71
71 #if defined(USE_NSS_CERTS) 72 #if defined(USE_NSS_CERTS)
72 AddSettingsPageUIHandler(new CertificatesHandler(false)); 73 AddSettingsPageUIHandler(new CertificatesHandler(false));
73 #elif defined(OS_WIN) || defined(OS_MACOSX) 74 #elif defined(OS_WIN) || defined(OS_MACOSX)
74 AddSettingsPageUIHandler(new NativeCertificatesHandler()); 75 AddSettingsPageUIHandler(new NativeCertificatesHandler());
75 #endif // defined(USE_NSS_CERTS) 76 #endif // defined(USE_NSS_CERTS)
76 77
77 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui)); 78 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui));
78 AddSettingsPageUIHandler(new BrowserLifetimeHandler()); 79 AddSettingsPageUIHandler(new BrowserLifetimeHandler());
79 AddSettingsPageUIHandler(new CookiesViewHandler()); 80 AddSettingsPageUIHandler(new CookiesViewHandler());
81 AddSettingsPageUIHandler(new ImportDataHandler());
Dan Beam 2016/11/03 19:23:05 this list looks like a drunk attempt at alphabetiz
tommycli 2016/11/03 19:29:38 Done. I made it slightly more alphabetized.
80 AddSettingsPageUIHandler(new DownloadsHandler()); 82 AddSettingsPageUIHandler(new DownloadsHandler());
81 AddSettingsPageUIHandler(new FontHandler(web_ui)); 83 AddSettingsPageUIHandler(new FontHandler(web_ui));
82 AddSettingsPageUIHandler(new ProtocolHandlersHandler()); 84 AddSettingsPageUIHandler(new ProtocolHandlersHandler());
83 AddSettingsPageUIHandler(new LanguagesHandler(web_ui)); 85 AddSettingsPageUIHandler(new LanguagesHandler(web_ui));
84 AddSettingsPageUIHandler(new MediaDevicesSelectionHandler(profile)); 86 AddSettingsPageUIHandler(new MediaDevicesSelectionHandler(profile));
85 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) 87 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)
86 AddSettingsPageUIHandler(new MetricsReportingHandler()); 88 AddSettingsPageUIHandler(new MetricsReportingHandler());
87 #endif 89 #endif
88 AddSettingsPageUIHandler(new PeopleHandler(profile)); 90 AddSettingsPageUIHandler(new PeopleHandler(profile));
89 AddSettingsPageUIHandler(new ProfileInfoHandler(profile)); 91 AddSettingsPageUIHandler(new ProfileInfoHandler(profile));
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 169 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
168 base::Time::Now() - load_start_time_); 170 base::Time::Now() - load_start_time_);
169 } 171 }
170 172
171 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 173 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
172 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 174 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
173 base::Time::Now() - load_start_time_); 175 base::Time::Now() - load_start_time_);
174 } 176 }
175 177
176 } // namespace settings 178 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698