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

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

Issue 6730044: Upgrading lzma_sdk to version 9.20. Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 9 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 | « no previous file | chrome/tools/build/win/create_installer_archive.py » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/logging.h" 8 #include "base/logging.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 10
11 extern "C" { 11 extern "C" {
12 #include "third_party/lzma_sdk/Archive/7z/7zExtract.h" 12 #include "third_party/lzma_sdk/C/7zExtract.h"
13 #include "third_party/lzma_sdk/Archive/7z/7zIn.h" 13 #include "third_party/lzma_sdk/C/7zIn.h"
14 #include "third_party/lzma_sdk/7zCrc.h" 14 #include "third_party/lzma_sdk/C/7zCrc.h"
robertshield 2011/03/25 01:35:01 If the order of includes here isn't important then
bradn 2011/03/25 02:10:27 Done.
15 } 15 }
16 16
17 17
18 namespace { 18 namespace {
19 19
20 typedef struct _CFileInStream { 20 typedef struct _CFileInStream {
21 ISzInStream InStream; 21 ISzInStream InStream;
22 HANDLE File; 22 HANDLE File;
23 } CFileInStream; 23 } CFileInStream;
24 24
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 220
221 bool LzmaUtil::CreateDirectory(const FilePath& dir) { 221 bool LzmaUtil::CreateDirectory(const FilePath& dir) {
222 bool ret = true; 222 bool ret = true;
223 if (directories_created_.find(dir.value()) == directories_created_.end()) { 223 if (directories_created_.find(dir.value()) == directories_created_.end()) {
224 ret = file_util::CreateDirectory(dir); 224 ret = file_util::CreateDirectory(dir);
225 if (ret) 225 if (ret)
226 directories_created_.insert(dir.value()); 226 directories_created_.insert(dir.value());
227 } 227 }
228 return ret; 228 return ret;
229 } 229 }
OLDNEW
« no previous file with comments | « no previous file | chrome/tools/build/win/create_installer_archive.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698