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

Side by Side Diff: chrome/browser/ssl/ssl_tab_helper.cc

Issue 13006020: net: extract net/cert out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | 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 #include "chrome/browser/ssl/ssl_tab_helper.h" 5 #include "chrome/browser/ssl/ssl_tab_helper.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/common/chrome_switches.h" 25 #include "chrome/common/chrome_switches.h"
26 #include "content/public/browser/notification_details.h" 26 #include "content/public/browser/notification_details.h"
27 #include "content/public/browser/notification_observer.h" 27 #include "content/public/browser/notification_observer.h"
28 #include "content/public/browser/notification_registrar.h" 28 #include "content/public/browser/notification_registrar.h"
29 #include "content/public/browser/notification_source.h" 29 #include "content/public/browser/notification_source.h"
30 #include "content/public/browser/web_contents.h" 30 #include "content/public/browser/web_contents.h"
31 #include "content/public/browser/web_contents_view.h" 31 #include "content/public/browser/web_contents_view.h"
32 #include "grit/generated_resources.h" 32 #include "grit/generated_resources.h"
33 #include "grit/theme_resources.h" 33 #include "grit/theme_resources.h"
34 #include "net/base/net_errors.h" 34 #include "net/base/net_errors.h"
35 #include "net/base/x509_certificate.h" 35 #include "net/cert/x509_certificate.h"
36 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
37 #include "ui/base/resource/resource_bundle.h" 37 #include "ui/base/resource/resource_bundle.h"
38 38
39 39
40 // SSLCertResultInfoBarDelegate ----------------------------------------------- 40 // SSLCertResultInfoBarDelegate -----------------------------------------------
41 41
42 namespace { 42 namespace {
43 43
44 class SSLCertResultInfoBarDelegate : public ConfirmInfoBarDelegate { 44 class SSLCertResultInfoBarDelegate : public ConfirmInfoBarDelegate {
45 public: 45 public:
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 SSLTabHelper::SSLAddCertData* 265 SSLTabHelper::SSLAddCertData*
266 SSLTabHelper::GetAddCertData(SSLAddCertHandler* handler) { 266 SSLTabHelper::GetAddCertData(SSLAddCertHandler* handler) {
267 // Find/create the slot. 267 // Find/create the slot.
268 linked_ptr<SSLAddCertData>& ptr_ref = 268 linked_ptr<SSLAddCertData>& ptr_ref =
269 request_id_to_add_cert_data_[handler->network_request_id()]; 269 request_id_to_add_cert_data_[handler->network_request_id()];
270 // Fill it if necessary. 270 // Fill it if necessary.
271 if (!ptr_ref.get()) 271 if (!ptr_ref.get())
272 ptr_ref.reset(new SSLAddCertData(web_contents_)); 272 ptr_ref.reset(new SSLAddCertData(web_contents_));
273 return ptr_ref.get(); 273 return ptr_ref.get();
274 } 274 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_error_info.cc ('k') | chrome/browser/ui/android/certificate_viewer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698