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

Side by Side Diff: chrome/browser/download/base_file.cc

Issue 7324031: Revert 91861 - When the download folder does not exist, change the download folder to a user's "D... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/download/base_file.h ('k') | chrome/browser/download/download_browsertest.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser/download/base_file.h" 5 #include "chrome/browser/download/base_file.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/format_macros.h" 8 #include "base/format_macros.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 bool BaseFile::Initialize(bool calculate_hash) { 49 bool BaseFile::Initialize(bool calculate_hash) {
50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); 50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
51 DCHECK(!detached_); 51 DCHECK(!detached_);
52 52
53 calculate_hash_ = calculate_hash; 53 calculate_hash_ = calculate_hash;
54 54
55 if (calculate_hash_) 55 if (calculate_hash_)
56 secure_hash_.reset(crypto::SecureHash::Create(crypto::SecureHash::SHA256)); 56 secure_hash_.reset(crypto::SecureHash::Create(crypto::SecureHash::SHA256));
57 57
58 FilePath save_path = 58 if (!full_path_.empty() ||
59 download_util::GetDefaultDownloadDirectoryFromPathService(); 59 download_util::CreateTemporaryFileForDownload(&full_path_))
60 if (full_path_.empty() && 60 return Open();
61 !file_util::CreateTemporaryFileInDir(save_path, &full_path_)) 61 return false;
62 return false;
63 return Open();
64 } 62 }
65 63
66 bool BaseFile::AppendDataToFile(const char* data, size_t data_len) { 64 bool BaseFile::AppendDataToFile(const char* data, size_t data_len) {
67 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); 65 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
68 DCHECK(!detached_); 66 DCHECK(!detached_);
69 67
70 if (!file_stream_.get()) 68 if (!file_stream_.get())
71 return false; 69 return false;
72 70
73 // TODO(phajdan.jr): get rid of this check. 71 // TODO(phajdan.jr): get rid of this check.
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 239
242 std::string BaseFile::DebugString() const { 240 std::string BaseFile::DebugString() const {
243 return base::StringPrintf("{ source_url_ = \"%s\"" 241 return base::StringPrintf("{ source_url_ = \"%s\""
244 " full_path_ = \"%" PRFilePath "\"" 242 " full_path_ = \"%" PRFilePath "\""
245 " bytes_so_far_ = %" PRId64 " detached_ = %c }", 243 " bytes_so_far_ = %" PRId64 " detached_ = %c }",
246 source_url_.spec().c_str(), 244 source_url_.spec().c_str(),
247 full_path_.value().c_str(), 245 full_path_.value().c_str(),
248 bytes_so_far_, 246 bytes_so_far_,
249 detached_ ? 'T' : 'F'); 247 detached_ ? 'T' : 'F');
250 } 248 }
OLDNEW
« no previous file with comments | « chrome/browser/download/base_file.h ('k') | chrome/browser/download/download_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698