| OLD | NEW |
| 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" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "base/values.h" | 14 #include "base/values.h" |
| 15 #include "chrome/browser/certificate_viewer.h" | 15 #include "chrome/browser/certificate_viewer.h" |
| 16 #include "chrome/browser/chrome_notification_types.h" | 16 #include "chrome/browser/chrome_notification_types.h" |
| 17 #include "chrome/browser/content_settings/host_content_settings_map.h" | 17 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 18 #include "chrome/browser/infobars/confirm_infobar_delegate.h" | |
| 19 #include "chrome/browser/infobars/infobar_service.h" | 18 #include "chrome/browser/infobars/infobar_service.h" |
| 20 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
| 21 #include "chrome/browser/ssl/ssl_add_cert_handler.h" | 20 #include "chrome/browser/ssl/ssl_add_cert_handler.h" |
| 22 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" | 21 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
| 23 #include "chrome/browser/ui/browser_finder.h" | 22 #include "chrome/browser/ui/browser_finder.h" |
| 24 #include "chrome/common/chrome_switches.h" | 23 #include "chrome/common/chrome_switches.h" |
| 24 #include "components/infobars/core/confirm_infobar_delegate.h" |
| 25 #include "components/infobars/core/infobar.h" | 25 #include "components/infobars/core/infobar.h" |
| 26 #include "components/infobars/core/infobar_manager.h" | 26 #include "components/infobars/core/infobar_manager.h" |
| 27 #include "content/public/browser/web_contents.h" | 27 #include "content/public/browser/web_contents.h" |
| 28 #include "grit/generated_resources.h" | 28 #include "grit/generated_resources.h" |
| 29 #include "grit/theme_resources.h" | 29 #include "grit/theme_resources.h" |
| 30 #include "net/base/net_errors.h" | 30 #include "net/base/net_errors.h" |
| 31 #include "net/cert/x509_certificate.h" | 31 #include "net/cert/x509_certificate.h" |
| 32 #include "ui/base/l10n/l10n_util.h" | 32 #include "ui/base/l10n/l10n_util.h" |
| 33 | 33 |
| 34 | 34 |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 // Find/create the slot. | 259 // Find/create the slot. |
| 260 linked_ptr<SSLAddCertData>& ptr_ref = | 260 linked_ptr<SSLAddCertData>& ptr_ref = |
| 261 request_id_to_add_cert_data_[handler->network_request_id()]; | 261 request_id_to_add_cert_data_[handler->network_request_id()]; |
| 262 // Fill it if necessary. | 262 // Fill it if necessary. |
| 263 if (!ptr_ref.get()) { | 263 if (!ptr_ref.get()) { |
| 264 ptr_ref.reset( | 264 ptr_ref.reset( |
| 265 new SSLAddCertData(InfoBarService::FromWebContents(web_contents_))); | 265 new SSLAddCertData(InfoBarService::FromWebContents(web_contents_))); |
| 266 } | 266 } |
| 267 return ptr_ref.get(); | 267 return ptr_ref.get(); |
| 268 } | 268 } |
| OLD | NEW |