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

Side by Side Diff: chrome/installer/util/lzma_util.cc

Issue 830002: win: string_util.h -> utf_string_conversions.h fix. (Closed)
Patch Set: Don't remove utf_string_conversions.h from string_util.h just yet Created 10 years, 9 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
« no previous file with comments | « chrome/common/zip.cc ('k') | chrome/test/mini_installer_test/mini_installer_test_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/installer/util/lzma_util.h" 5 #include "chrome/installer/util/lzma_util.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/string_util.h" 8 #include "base/logging.h"
9 #include "base/utf_string_conversions.h"
9 10
10 extern "C" { 11 extern "C" {
11 #include "third_party/lzma_sdk/Archive/7z/7zExtract.h" 12 #include "third_party/lzma_sdk/Archive/7z/7zExtract.h"
12 #include "third_party/lzma_sdk/Archive/7z/7zIn.h" 13 #include "third_party/lzma_sdk/Archive/7z/7zIn.h"
13 #include "third_party/lzma_sdk/7zCrc.h" 14 #include "third_party/lzma_sdk/7zCrc.h"
14 } 15 }
15 16
16 17
17 namespace { 18 namespace {
18 19
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 SzArDbExFree(&db, allocImp.Free); 218 SzArDbExFree(&db, allocImp.Free);
218 return ret; 219 return ret;
219 } 220 }
220 221
221 void LzmaUtil::CloseArchive() { 222 void LzmaUtil::CloseArchive() {
222 if (archive_handle_) { 223 if (archive_handle_) {
223 CloseHandle(archive_handle_); 224 CloseHandle(archive_handle_);
224 archive_handle_ = NULL; 225 archive_handle_ = NULL;
225 } 226 }
226 } 227 }
OLDNEW
« no previous file with comments | « chrome/common/zip.cc ('k') | chrome/test/mini_installer_test/mini_installer_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698