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

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

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 8 years, 5 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_OPTIONS2_CERTIFICATE_MANAGER_HANDLER2_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CERTIFICATE_MANAGER_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CERTIFICATE_MANAGER_HANDLER2_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CERTIFICATE_MANAGER_HANDLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "chrome/browser/cancelable_request.h" 14 #include "chrome/browser/cancelable_request.h"
15 #include "chrome/browser/certificate_manager_model.h" 15 #include "chrome/browser/certificate_manager_model.h"
16 #include "chrome/browser/ui/select_file_dialog.h" 16 #include "chrome/browser/ui/select_file_dialog.h"
17 #include "chrome/browser/ui/webui/options2/options_ui2.h" 17 #include "chrome/browser/ui/webui/options2/options_ui.h"
18 #include "net/base/cert_database.h" 18 #include "net/base/cert_database.h"
19 #include "ui/gfx/native_widget_types.h" 19 #include "ui/gfx/native_widget_types.h"
20 20
21 #if defined(OS_CHROMEOS) 21 #if defined(OS_CHROMEOS)
22 #include "chromeos/dbus/cryptohome_client.h" 22 #include "chromeos/dbus/cryptohome_client.h"
23 #endif 23 #endif
24 24
25 namespace options2 { 25 namespace options2 {
26 26
27 class CertIdMap; 27 class CertIdMap;
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
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 options2 186 } // namespace options2
187 187
188 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CERTIFICATE_MANAGER_HANDLER2_H_ 188 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CERTIFICATE_MANAGER_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698