diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 00:39:26 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 00:39:26 +0000 |
| commit | 476dafb386743bb8db7c3cda201b86b9c70bf753 (patch) | |
| tree | 6d43f23f392d4fba47e8690cec1088a27b8fe12b /ipc/ipc_message_utils.cc | |
| parent | abdd6ba46c3c48c3c307ee0c5e5697d9f4f4fc99 (diff) | |
| download | chromium_src-476dafb386743bb8db7c3cda201b86b9c70bf753.zip chromium_src-476dafb386743bb8db7c3cda201b86b9c70bf753.tar.gz chromium_src-476dafb386743bb8db7c3cda201b86b9c70bf753.tar.bz2 | |
Move more uses of string16 to specify base::
This makes base, ui, and net compile without the "using base::string16" directive that's currently checked in.
BUG=
Review URL: https://codereview.chromium.org/100303003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_message_utils.cc')
| -rw-r--r-- | ipc/ipc_message_utils.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc index c5ace24..0390648 100644 --- a/ipc/ipc_message_utils.cc +++ b/ipc/ipc_message_utils.cc @@ -344,7 +344,7 @@ void ParamTraits<std::wstring>::Log(const param_type& p, std::string* l) { } #if !defined(WCHAR_T_IS_UTF16) -void ParamTraits<string16>::Log(const param_type& p, std::string* l) { +void ParamTraits<base::string16>::Log(const param_type& p, std::string* l) { l->append(UTF16ToUTF8(p)); } #endif @@ -536,7 +536,7 @@ void ParamTraits<base::NullableString16>::Write(Message* m, bool ParamTraits<base::NullableString16>::Read(const Message* m, PickleIterator* iter, param_type* r) { - string16 string; + base::string16 string; if (!ReadParam(m, iter, &string)) return false; bool is_null; |