diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 21:00:16 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 21:00:16 +0000 |
| commit | 969201575445f53b11562542f4d8a12d8f1a4777 (patch) | |
| tree | fa491f8ec26fa6bd232e3cf5a5051acd2fea6e97 /chrome/browser/certificate_manager_model.cc | |
| parent | 84a3403847df91ea351d67e2d50025fd3f0bf651 (diff) | |
| download | chromium_src-969201575445f53b11562542f4d8a12d8f1a4777.zip chromium_src-969201575445f53b11562542f4d8a12d8f1a4777.tar.gz chromium_src-969201575445f53b11562542f4d8a12d8f1a4777.tar.bz2 | |
Replace string16 with base::string16.
This updates portions of chrome/browser/... to use the base namespace.
BUG=
Review URL: https://codereview.chromium.org/105193002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/certificate_manager_model.cc')
| -rw-r--r-- | chrome/browser/certificate_manager_model.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc index 1b66dee..afdd026 100644 --- a/chrome/browser/certificate_manager_model.cc +++ b/chrome/browser/certificate_manager_model.cc @@ -66,10 +66,10 @@ void CertificateManagerModel::FilterAndBuildOrgGroupingMap( } } -string16 CertificateManagerModel::GetColumnText( +base::string16 CertificateManagerModel::GetColumnText( const net::X509Certificate& cert, Column column) const { - string16 rv; + base::string16 rv; switch (column) { case COL_SUBJECT_NAME: rv = UTF8ToUTF16( @@ -103,7 +103,7 @@ string16 CertificateManagerModel::GetColumnText( int CertificateManagerModel::ImportFromPKCS12(net::CryptoModule* module, const std::string& data, - const string16& password, + const base::string16& password, bool is_extractable) { int result = cert_db_->ImportFromPKCS12(module, data, password, is_extractable, NULL); |