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

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

Issue 1838273003: MD Settings: Hooking up native certificate manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Spaces. 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
(...skipping 23 matching lines...) Expand all
34 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" 34 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
35 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h" 35 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h"
36 #else // !defined(OS_CHROMEOS) 36 #else // !defined(OS_CHROMEOS)
37 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" 37 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
38 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" 38 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
39 #include "chrome/browser/ui/webui/settings/system_handler.h" 39 #include "chrome/browser/ui/webui/settings/system_handler.h"
40 #endif // defined(OS_CHROMEOS) 40 #endif // defined(OS_CHROMEOS)
41 41
42 #if defined(USE_NSS_CERTS) 42 #if defined(USE_NSS_CERTS)
43 #include "chrome/browser/ui/webui/settings/certificates_handler.h" 43 #include "chrome/browser/ui/webui/settings/certificates_handler.h"
44 #elif defined(OS_WIN) || defined(OS_MACOSX)
45 #include "chrome/browser/ui/webui/settings/native_certificates_handler.h"
44 #endif // defined(USE_NSS_CERTS) 46 #endif // defined(USE_NSS_CERTS)
45 47
46 namespace settings { 48 namespace settings {
47 49
48 MdSettingsUI::MdSettingsUI(content::WebUI* web_ui) 50 MdSettingsUI::MdSettingsUI(content::WebUI* web_ui)
49 : content::WebUIController(web_ui), 51 : content::WebUIController(web_ui),
50 WebContentsObserver(web_ui->GetWebContents()) { 52 WebContentsObserver(web_ui->GetWebContents()) {
51 Profile* profile = Profile::FromWebUI(web_ui); 53 Profile* profile = Profile::FromWebUI(web_ui);
52 AddSettingsPageUIHandler(new AppearanceHandler(web_ui)); 54 AddSettingsPageUIHandler(new AppearanceHandler(web_ui));
53 55
54 #if defined(USE_NSS_CERTS) 56 #if defined(USE_NSS_CERTS)
55 AddSettingsPageUIHandler(new CertificatesHandler(false)); 57 AddSettingsPageUIHandler(new CertificatesHandler(false));
58 #elif defined(OS_WIN) || defined(OS_MACOSX)
59 AddSettingsPageUIHandler(new NativeCertificatesHandler());
56 #endif // defined(USE_NSS_CERTS) 60 #endif // defined(USE_NSS_CERTS)
57 61
58 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui)); 62 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui));
59 AddSettingsPageUIHandler(new DownloadsHandler()); 63 AddSettingsPageUIHandler(new DownloadsHandler());
60 AddSettingsPageUIHandler(new FontHandler(web_ui)); 64 AddSettingsPageUIHandler(new FontHandler(web_ui));
61 AddSettingsPageUIHandler(new LanguagesHandler(web_ui)); 65 AddSettingsPageUIHandler(new LanguagesHandler(web_ui));
62 AddSettingsPageUIHandler(new PeopleHandler(profile)); 66 AddSettingsPageUIHandler(new PeopleHandler(profile));
63 AddSettingsPageUIHandler(new SearchEnginesHandler(profile)); 67 AddSettingsPageUIHandler(new SearchEnginesHandler(profile));
64 AddSettingsPageUIHandler(new SiteSettingsHandler(profile)); 68 AddSettingsPageUIHandler(new SiteSettingsHandler(profile));
65 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); 69 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 131 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
128 base::Time::Now() - load_start_time_); 132 base::Time::Now() - load_start_time_);
129 } 133 }
130 134
131 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 135 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
132 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 136 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
133 base::Time::Now() - load_start_time_); 137 base::Time::Now() - load_start_time_);
134 } 138 }
135 139
136 } // namespace settings 140 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/webui/settings/native_certificates_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698