diff options
Diffstat (limited to 'chrome/browser/download/download_manager.cc')
-rw-r--r-- | chrome/browser/download/download_manager.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index 5747c3b..965f2ed 100644 --- a/chrome/browser/download/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -1080,7 +1080,7 @@ void DownloadManager::GenerateExtension( extension.assign(default_extension); std::string mime_type_from_extension; - net::GetMimeTypeFromFile(file_name.ToWStringHack(), + net::GetMimeTypeFromFile(file_name, &mime_type_from_extension); if (mime_type == mime_type_from_extension) { // The hinted extension matches the mime type. It looks like a winner. @@ -1198,11 +1198,11 @@ static const char* kExecutableBlackList[] = { // static bool DownloadManager::IsExecutableMimeType(const std::string& mime_type) { - for (int i=0; i < arraysize(kExecutableWhiteList); ++i) { + for (size_t i = 0; i < arraysize(kExecutableWhiteList); ++i) { if (net::MatchesMimeType(kExecutableWhiteList[i], mime_type)) return true; } - for (int i=0; i < arraysize(kExecutableBlackList); ++i) { + for (size_t i = 0; i < arraysize(kExecutableBlackList); ++i) { if (net::MatchesMimeType(kExecutableBlackList[i], mime_type)) return false; } |