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

Unified Diff: content/browser/web_contents/web_drag_source_mac.mm

Issue 11028131: Shift passage of FileStream in downloads system to be by scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed blank line. Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/web_drag_source_mac.mm
diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm
index 8cccff57a478d956c2fb7c252b3e432a0671a62a..98712116d2daa1eaef04e01b0b0dbae75d39410f 100644
--- a/content/browser/web_contents/web_drag_source_mac.mm
+++ b/content/browser/web_contents/web_drag_source_mac.mm
@@ -342,16 +342,16 @@ void PromiseWriterHelper(const WebDropData& drop_data,
// which is blocking. Since this operation is already blocking the
// UI thread on OSX, it should be reasonable to let it happen.
base::ThreadRestrictions::ScopedAllowIO allowIO;
- FileStream* fileStream =
+ scoped_ptr<FileStream> fileStream(
drag_download_util::CreateFileStreamForDrop(
- &filePath, content::GetContentClient()->browser()->GetNetLog());
- if (!fileStream)
+ &filePath, content::GetContentClient()->browser()->GetNetLog()));
+ if (!fileStream.get())
return nil;
if (downloadURL_.is_valid()) {
scoped_refptr<DragDownloadFile> dragFileDownloader(new DragDownloadFile(
filePath,
- linked_ptr<net::FileStream>(fileStream),
+ fileStream.Pass(),
downloadURL_,
content::Referrer(contents_->GetURL(), dropData_->referrer_policy),
contents_->GetEncoding(),

Powered by Google App Engine
This is Rietveld 408576698