Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: chrome/common/zip.cc

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/zip.h" 5 #include "chrome/common/zip.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/string_split.h"
9 #include "base/string_util.h" 10 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
11 #include "net/base/file_stream.h" 12 #include "net/base/file_stream.h"
12 #include "third_party/zlib/contrib/minizip/unzip.h" 13 #include "third_party/zlib/contrib/minizip/unzip.h"
13 #include "third_party/zlib/contrib/minizip/zip.h" 14 #include "third_party/zlib/contrib/minizip/zip.h"
14 #if defined(OS_WIN) 15 #if defined(OS_WIN)
15 #include "third_party/zlib/contrib/minizip/iowin32.h" 16 #include "third_party/zlib/contrib/minizip/iowin32.h"
16 #endif 17 #endif
17 18
18 static const int kZipMaxPath = 256; 19 static const int kZipMaxPath = 256;
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 } 305 }
305 } 306 }
306 307
307 if (ZIP_OK != zipClose(zip_file, NULL)) { // global comment 308 if (ZIP_OK != zipClose(zip_file, NULL)) { // global comment
308 LOG(ERROR) << "Error closing zip file " << dest_file_str; 309 LOG(ERROR) << "Error closing zip file " << dest_file_str;
309 return false; 310 return false;
310 } 311 }
311 312
312 return success; 313 return success;
313 } 314 }
OLDNEW
« no previous file with comments | « chrome/common/pepper_plugin_registry.cc ('k') | chrome/default_plugin/plugin_database_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698