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

Unified Diff: chrome/browser/download/save_package.cc

Issue 4222005: Turn on file access checks on Win. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Second try Created 10 years, 1 month 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
« no previous file with comments | « chrome/browser/download/download_util.cc ('k') | chrome/browser/extensions/sandboxed_extension_unpacker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/save_package.cc
===================================================================
--- chrome/browser/download/save_package.cc (revision 64981)
+++ chrome/browser/download/save_package.cc (working copy)
@@ -13,6 +13,7 @@
#include "base/stl_util-inl.h"
#include "base/string_piece.h"
#include "base/string_split.h"
+#include "base/thread_restrictions.h"
#include "base/utf_string_conversions.h"
#include "base/task.h"
#include "base/thread.h"
@@ -1158,6 +1159,10 @@
}
FilePath SavePackage::EnsureHtmlExtension(const FilePath& name) {
+ // The GetMimeTypeFromExtension call will end up going to disk. Do this on
+ // another thread to avoid slowing the UI thread. http://crbug.com/61775
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+
// If the file name doesn't have an extension suitable for HTML files,
// append one.
FilePath::StringType ext = name.Extension();
@@ -1174,6 +1179,10 @@
FilePath SavePackage::EnsureMimeExtension(const FilePath& name,
const FilePath::StringType& contents_mime_type) {
+ // The GetMimeTypeFromExtension call will end up going to disk. Do this on
+ // another thread to avoid slowing the UI thread. http://crbug.com/61775
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+
// Start extension at 1 to skip over period if non-empty.
FilePath::StringType ext = name.Extension().length() ?
name.Extension().substr(1) : name.Extension();
« no previous file with comments | « chrome/browser/download/download_util.cc ('k') | chrome/browser/extensions/sandboxed_extension_unpacker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698