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 /base/pickle.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 'base/pickle.h')
-rw-r--r-- | base/pickle.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/pickle.h b/base/pickle.h index 3254837..dd34f54 100644 --- a/base/pickle.h +++ b/base/pickle.h @@ -37,7 +37,7 @@ class BASE_EXPORT PickleIterator { bool ReadFloat(float* result) WARN_UNUSED_RESULT; bool ReadString(std::string* result) WARN_UNUSED_RESULT; bool ReadWString(std::wstring* result) WARN_UNUSED_RESULT; - bool ReadString16(string16* result) WARN_UNUSED_RESULT; + bool ReadString16(base::string16* result) WARN_UNUSED_RESULT; bool ReadData(const char** data, int* length) WARN_UNUSED_RESULT; bool ReadBytes(const char** data, int length) WARN_UNUSED_RESULT; @@ -179,7 +179,7 @@ class BASE_EXPORT Pickle { return iter->ReadWString(result); } bool ReadString16(PickleIterator* iter, - string16* result) const WARN_UNUSED_RESULT { + base::string16* result) const WARN_UNUSED_RESULT { return iter->ReadString16(result); } // A pointer to the data will be placed in *data, and the length will be @@ -243,7 +243,7 @@ class BASE_EXPORT Pickle { } bool WriteString(const std::string& value); bool WriteWString(const std::wstring& value); - bool WriteString16(const string16& value); + bool WriteString16(const base::string16& value); // "Data" is a blob with a length. When you read it out you will be given the // length. See also WriteBytes. bool WriteData(const char* data, int length); |