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.h | |
| 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.h')
| -rw-r--r-- | ipc/ipc_message_utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h index e9c0ba0b0..24b38af 100644 --- a/ipc/ipc_message_utils.h +++ b/ipc/ipc_message_utils.h @@ -265,8 +265,8 @@ struct ParamTraits<std::wstring> { // need this trait. #if !defined(WCHAR_T_IS_UTF16) template <> -struct ParamTraits<string16> { - typedef string16 param_type; +struct ParamTraits<base::string16> { + typedef base::string16 param_type; static void Write(Message* m, const param_type& p) { m->WriteString16(p); } |