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

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

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ssl/ssl_tab_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_error_info.h" 5 #include "chrome/browser/ssl/ssl_error_info.h"
6 6
7 #include "base/i18n/time_formatting.h" 7 #include "base/i18n/time_formatting.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "content/public/browser/cert_store.h" 9 #include "content/public/browser/cert_store.h"
10 #include "grit/chromium_strings.h" 10 #include "grit/chromium_strings.h"
11 #include "grit/generated_resources.h" 11 #include "grit/generated_resources.h"
12 #include "net/base/escape.h" 12 #include "net/base/escape.h"
13 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
14 #include "net/cert/cert_status_flags.h" 14 #include "net/cert/cert_status_flags.h"
15 #include "net/ssl/ssl_info.h" 15 #include "net/ssl/ssl_info.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #include "url/gurl.h" 17 #include "url/gurl.h"
18 18
19 using base::UTF8ToUTF16;
20
19 SSLErrorInfo::SSLErrorInfo(const base::string16& title, 21 SSLErrorInfo::SSLErrorInfo(const base::string16& title,
20 const base::string16& details, 22 const base::string16& details,
21 const base::string16& short_description, 23 const base::string16& short_description,
22 const std::vector<base::string16>& extra_info) 24 const std::vector<base::string16>& extra_info)
23 : title_(title), 25 : title_(title),
24 details_(details), 26 details_(details),
25 short_description_(short_description), 27 short_description_(short_description),
26 extra_information_(extra_info) { 28 extra_information_(extra_info) {
27 } 29 }
28 30
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 cert_id, &cert); 318 cert_id, &cert);
317 DCHECK(r); 319 DCHECK(r);
318 } 320 }
319 if (errors) 321 if (errors)
320 errors->push_back( 322 errors->push_back(
321 SSLErrorInfo::CreateError(kErrorTypes[i], cert.get(), url)); 323 SSLErrorInfo::CreateError(kErrorTypes[i], cert.get(), url));
322 } 324 }
323 } 325 }
324 return count; 326 return count;
325 } 327 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ssl/ssl_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698