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

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

Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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"
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/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/content_settings/host_content_settings_map.h" 16 #include "chrome/browser/content_settings/host_content_settings_map.h"
17 #include "chrome/browser/infobars/confirm_infobar_delegate.h" 17 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
18 #include "chrome/browser/infobars/infobar.h" 18 #include "chrome/browser/infobars/infobar.h"
19 #include "chrome/browser/infobars/infobar_service.h" 19 #include "chrome/browser/infobars/infobar_service.h"
20 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/ssl/ssl_add_cert_handler.h" 21 #include "chrome/browser/ssl/ssl_add_cert_handler.h"
22 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" 22 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
23 #include "chrome/browser/ui/browser_finder.h" 23 #include "chrome/browser/ui/browser_finder.h"
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 SSLTabHelper::SSLAddCertData* 264 SSLTabHelper::SSLAddCertData*
265 SSLTabHelper::GetAddCertData(SSLAddCertHandler* handler) { 265 SSLTabHelper::GetAddCertData(SSLAddCertHandler* handler) {
266 // Find/create the slot. 266 // Find/create the slot.
267 linked_ptr<SSLAddCertData>& ptr_ref = 267 linked_ptr<SSLAddCertData>& ptr_ref =
268 request_id_to_add_cert_data_[handler->network_request_id()]; 268 request_id_to_add_cert_data_[handler->network_request_id()];
269 // Fill it if necessary. 269 // Fill it if necessary.
270 if (!ptr_ref.get()) 270 if (!ptr_ref.get())
271 ptr_ref.reset(new SSLAddCertData(web_contents_)); 271 ptr_ref.reset(new SSLAddCertData(web_contents_));
272 return ptr_ref.get(); 272 return ptr_ref.get();
273 } 273 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_error_info.cc ('k') | chrome/browser/status_icons/status_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698