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

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

Issue 137263007: Move CancelableTaskTracker to //base/task/CancelableTaskTracker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move to base/task/cancelable_task_tracker* Created 6 years, 10 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 (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 "base/task/cancelable_task_tracker.h"
13 #include "chrome/browser/certificate_manager_model.h" 14 #include "chrome/browser/certificate_manager_model.h"
14 #include "chrome/browser/ui/webui/options/options_ui.h" 15 #include "chrome/browser/ui/webui/options/options_ui.h"
15 #include "chrome/common/cancelable_task_tracker.h"
16 #include "net/cert/nss_cert_database.h" 16 #include "net/cert/nss_cert_database.h"
17 #include "ui/gfx/native_widget_types.h" 17 #include "ui/gfx/native_widget_types.h"
18 #include "ui/shell_dialogs/select_file_dialog.h" 18 #include "ui/shell_dialogs/select_file_dialog.h"
19 19
20 namespace options { 20 namespace options {
21 21
22 class CertIdMap; 22 class CertIdMap;
23 class FileAccessProvider; 23 class FileAccessProvider;
24 24
25 class CertificateManagerHandler 25 class CertificateManagerHandler
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 // wait for file to be read, etc. 168 // wait for file to be read, etc.
169 base::FilePath file_path_; 169 base::FilePath file_path_;
170 base::string16 password_; 170 base::string16 password_;
171 bool use_hardware_backed_; 171 bool use_hardware_backed_;
172 std::string file_data_; 172 std::string file_data_;
173 net::CertificateList selected_cert_list_; 173 net::CertificateList selected_cert_list_;
174 scoped_refptr<ui::SelectFileDialog> select_file_dialog_; 174 scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
175 scoped_refptr<net::CryptoModule> module_; 175 scoped_refptr<net::CryptoModule> module_;
176 176
177 // Used in reading and writing certificate files. 177 // Used in reading and writing certificate files.
178 CancelableTaskTracker tracker_; 178 base::CancelableTaskTracker tracker_;
179 scoped_refptr<FileAccessProvider> file_access_provider_; 179 scoped_refptr<FileAccessProvider> file_access_provider_;
180 180
181 scoped_ptr<CertIdMap> cert_id_map_; 181 scoped_ptr<CertIdMap> cert_id_map_;
182 182
183 base::WeakPtrFactory<CertificateManagerHandler> weak_ptr_factory_; 183 base::WeakPtrFactory<CertificateManagerHandler> weak_ptr_factory_;
184 184
185 DISALLOW_COPY_AND_ASSIGN(CertificateManagerHandler); 185 DISALLOW_COPY_AND_ASSIGN(CertificateManagerHandler);
186 }; 186 };
187 187
188 } // namespace options 188 } // namespace options
189 189
190 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_ 190 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/favicon_webui_handler.h ('k') | chrome/browser/ui/webui/options/certificate_manager_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698