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

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

Issue 1900913002: Settings People Revamp: Split Profile Info out into its own handler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months 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/appearance_handler.h" 13 #include "chrome/browser/ui/webui/settings/appearance_handler.h"
14 #include "chrome/browser/ui/webui/settings/downloads_handler.h" 14 #include "chrome/browser/ui/webui/settings/downloads_handler.h"
15 #include "chrome/browser/ui/webui/settings/font_handler.h" 15 #include "chrome/browser/ui/webui/settings/font_handler.h"
16 #include "chrome/browser/ui/webui/settings/languages_handler.h" 16 #include "chrome/browser/ui/webui/settings/languages_handler.h"
17 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h" 17 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
18 #include "chrome/browser/ui/webui/settings/people_handler.h" 18 #include "chrome/browser/ui/webui/settings/people_handler.h"
19 #include "chrome/browser/ui/webui/settings/profile_info_handler.h"
19 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h" 20 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h"
20 #include "chrome/browser/ui/webui/settings/search_engines_handler.h" 21 #include "chrome/browser/ui/webui/settings/search_engines_handler.h"
21 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler. h" 22 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler. h"
22 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" 23 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
23 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h" 24 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h"
24 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" 25 #include "chrome/browser/ui/webui/settings/site_settings_handler.h"
25 #include "chrome/common/url_constants.h" 26 #include "chrome/common/url_constants.h"
26 #include "content/public/browser/web_contents.h" 27 #include "content/public/browser/web_contents.h"
27 #include "content/public/browser/web_ui.h" 28 #include "content/public/browser/web_ui.h"
28 #include "content/public/browser/web_ui_data_source.h" 29 #include "content/public/browser/web_ui_data_source.h"
(...skipping 28 matching lines...) Expand all
57 AddSettingsPageUIHandler(new CertificatesHandler(false)); 58 AddSettingsPageUIHandler(new CertificatesHandler(false));
58 #elif defined(OS_WIN) || defined(OS_MACOSX) 59 #elif defined(OS_WIN) || defined(OS_MACOSX)
59 AddSettingsPageUIHandler(new NativeCertificatesHandler()); 60 AddSettingsPageUIHandler(new NativeCertificatesHandler());
60 #endif // defined(USE_NSS_CERTS) 61 #endif // defined(USE_NSS_CERTS)
61 62
62 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui)); 63 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui));
63 AddSettingsPageUIHandler(new DownloadsHandler()); 64 AddSettingsPageUIHandler(new DownloadsHandler());
64 AddSettingsPageUIHandler(new FontHandler(web_ui)); 65 AddSettingsPageUIHandler(new FontHandler(web_ui));
65 AddSettingsPageUIHandler(new LanguagesHandler(web_ui)); 66 AddSettingsPageUIHandler(new LanguagesHandler(web_ui));
66 AddSettingsPageUIHandler(new PeopleHandler(profile)); 67 AddSettingsPageUIHandler(new PeopleHandler(profile));
68 AddSettingsPageUIHandler(new ProfileInfoHandler(profile));
67 AddSettingsPageUIHandler(new SearchEnginesHandler(profile)); 69 AddSettingsPageUIHandler(new SearchEnginesHandler(profile));
68 AddSettingsPageUIHandler(new SiteSettingsHandler(profile)); 70 AddSettingsPageUIHandler(new SiteSettingsHandler(profile));
69 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); 71 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));
70 72
71 #if defined(OS_CHROMEOS) 73 #if defined(OS_CHROMEOS)
72 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler()); 74 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler());
73 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui)); 75 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui));
74 #else 76 #else
75 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui)); 77 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui));
76 AddSettingsPageUIHandler(new ManageProfileHandler(profile)); 78 AddSettingsPageUIHandler(new ManageProfileHandler(profile));
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 127 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
126 base::Time::Now() - load_start_time_); 128 base::Time::Now() - load_start_time_);
127 } 129 }
128 130
129 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 131 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
130 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 132 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
131 base::Time::Now() - load_start_time_); 133 base::Time::Now() - load_start_time_);
132 } 134 }
133 135
134 } // namespace settings 136 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/settings_resources.grd ('k') | chrome/browser/ui/webui/settings/people_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698