diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 23:28:41 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 23:28:41 +0000 |
| commit | 9fd9092f7a347c90dc761e3c56fdea7e94714fb2 (patch) | |
| tree | 992780dee1dcc30d08808d1f889d440bce8c1257 /chrome/browser/password_manager | |
| parent | f45d2a74d471efbe10c8f4e7ea044dbb0a351156 (diff) | |
| download | chromium_src-9fd9092f7a347c90dc761e3c56fdea7e94714fb2.zip chromium_src-9fd9092f7a347c90dc761e3c56fdea7e94714fb2.tar.gz chromium_src-9fd9092f7a347c90dc761e3c56fdea7e94714fb2.tar.bz2 | |
chrome 5: string_util.h -> utf_string_conversions.h fix.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/671024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40963 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/password_manager')
| -rw-r--r-- | chrome/browser/password_manager/encryptor_linux.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/password_manager/encryptor_unittest.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/password_manager/password_manager.cc | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/password_manager/encryptor_linux.cc b/chrome/browser/password_manager/encryptor_linux.cc index cc0fa23..44ed207 100644 --- a/chrome/browser/password_manager/encryptor_linux.cc +++ b/chrome/browser/password_manager/encryptor_linux.cc @@ -5,7 +5,7 @@ #include "chrome/browser/password_manager/encryptor.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" bool Encryptor::EncryptString16(const string16& plaintext, std::string* ciphertext) { diff --git a/chrome/browser/password_manager/encryptor_unittest.cc b/chrome/browser/password_manager/encryptor_unittest.cc index 45a193f..29e518d8 100644 --- a/chrome/browser/password_manager/encryptor_unittest.cc +++ b/chrome/browser/password_manager/encryptor_unittest.cc @@ -7,6 +7,7 @@ #include <string> #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc index e7b49b2..069ec4c 100644 --- a/chrome/browser/password_manager/password_manager.cc +++ b/chrome/browser/password_manager/password_manager.cc @@ -4,10 +4,12 @@ #include "chrome/browser/password_manager/password_manager.h" +#include <vector> + #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/stl_util-inl.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_form_manager.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" @@ -37,7 +39,7 @@ class SavePasswordInfoBarDelegate : public ConfirmInfoBarDelegate { form_to_save_(form_to_save) { } - virtual ~SavePasswordInfoBarDelegate() { } + virtual ~SavePasswordInfoBarDelegate() { } // Overridden from ConfirmInfoBarDelegate: virtual void InfoBarClosed() { |