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

Side by Side Diff: chrome/browser/ui/webui/options/certificate_manager_handler.h

Issue 10916094: Move the NSS functions out of CertDatabase into a new NSSCertDatabase class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 8 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "chrome/browser/cancelable_request.h" 13 #include "chrome/browser/cancelable_request.h"
14 #include "chrome/browser/certificate_manager_model.h" 14 #include "chrome/browser/certificate_manager_model.h"
15 #include "chrome/browser/ui/webui/options/options_ui.h" 15 #include "chrome/browser/ui/webui/options/options_ui.h"
16 #include "net/base/cert_database.h" 16 #include "net/base/nss_cert_database.h"
17 #include "ui/base/dialogs/select_file_dialog.h" 17 #include "ui/base/dialogs/select_file_dialog.h"
18 #include "ui/gfx/native_widget_types.h" 18 #include "ui/gfx/native_widget_types.h"
19 19
20 #if defined(OS_CHROMEOS) 20 #if defined(OS_CHROMEOS)
21 #include "chromeos/dbus/cryptohome_client.h" 21 #include "chromeos/dbus/cryptohome_client.h"
22 #endif 22 #endif
23 23
24 namespace options { 24 namespace options {
25 25
26 class CertIdMap; 26 class CertIdMap;
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 void PopulateTree(const std::string& tab_name, net::CertType type); 139 void PopulateTree(const std::string& tab_name, net::CertType type);
140 140
141 // Display a WebUI error message box. 141 // Display a WebUI error message box.
142 void ShowError(const std::string& title, const std::string& error) const; 142 void ShowError(const std::string& title, const std::string& error) const;
143 143
144 // Display a WebUI error message box for import failures. 144 // Display a WebUI error message box for import failures.
145 // Depends on |selected_cert_list_| being set to the imports that we 145 // Depends on |selected_cert_list_| being set to the imports that we
146 // attempted to import. 146 // attempted to import.
147 void ShowImportErrors( 147 void ShowImportErrors(
148 const std::string& title, 148 const std::string& title,
149 const net::CertDatabase::ImportCertFailureList& not_imported) const; 149 const net::NSSCertDatabase::ImportCertFailureList& not_imported) const;
150 150
151 #if defined(OS_CHROMEOS) 151 #if defined(OS_CHROMEOS)
152 // Check whether Tpm token is ready and notifiy JS side. 152 // Check whether Tpm token is ready and notifiy JS side.
153 void CheckTpmTokenReady(const base::ListValue* args); 153 void CheckTpmTokenReady(const base::ListValue* args);
154 void CheckTpmTokenReadyInternal( 154 void CheckTpmTokenReadyInternal(
155 chromeos::DBusMethodCallStatus call_status, 155 chromeos::DBusMethodCallStatus call_status,
156 bool is_tpm_token_ready); 156 bool is_tpm_token_ready);
157 #endif 157 #endif
158 158
159 gfx::NativeWindow GetParentWindow() const; 159 gfx::NativeWindow GetParentWindow() const;
(...skipping 19 matching lines...) Expand all
179 base::WeakPtrFactory<CertificateManagerHandler> weak_ptr_factory_; 179 base::WeakPtrFactory<CertificateManagerHandler> weak_ptr_factory_;
180 180
181 scoped_ptr<CertIdMap> cert_id_map_; 181 scoped_ptr<CertIdMap> cert_id_map_;
182 182
183 DISALLOW_COPY_AND_ASSIGN(CertificateManagerHandler); 183 DISALLOW_COPY_AND_ASSIGN(CertificateManagerHandler);
184 }; 184 };
185 185
186 } // namespace options 186 } // namespace options
187 187
188 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_ 188 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698