summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 00:39:26 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 00:39:26 +0000
commit476dafb386743bb8db7c3cda201b86b9c70bf753 (patch)
tree6d43f23f392d4fba47e8690cec1088a27b8fe12b /third_party
parentabdd6ba46c3c48c3c307ee0c5e5697d9f4f4fc99 (diff)
downloadchromium_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 'third_party')
-rw-r--r--third_party/zlib/google/zip_reader.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/zlib/google/zip_reader.cc b/third_party/zlib/google/zip_reader.cc
index d29082c..862e29a 100644
--- a/third_party/zlib/google/zip_reader.cc
+++ b/third_party/zlib/google/zip_reader.cc
@@ -39,7 +39,7 @@ ZipReader::EntryInfo::EntryInfo(const std::string& file_name_in_zip,
is_unsafe_ = file_name_in_zip.find("..") != std::string::npos;
// We also consider that the file name is unsafe, if it's invalid UTF-8.
- string16 file_name_utf16;
+ base::string16 file_name_utf16;
if (!UTF8ToUTF16(file_name_in_zip.data(), file_name_in_zip.size(),
&file_name_utf16)) {
is_unsafe_ = true;