summaryrefslogtreecommitdiff
path: root/chromium/webkit/browser/fileapi/dragged_file_util.cc
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-03-18 13:16:26 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-20 15:55:39 +0100
commit3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch)
tree92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/webkit/browser/fileapi/dragged_file_util.cc
parente90d7c4b152c56919d963987e2503f9909a666d2 (diff)
downloadqtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/webkit/browser/fileapi/dragged_file_util.cc')
-rw-r--r--chromium/webkit/browser/fileapi/dragged_file_util.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/webkit/browser/fileapi/dragged_file_util.cc b/chromium/webkit/browser/fileapi/dragged_file_util.cc
index b4536a70f9a..3e81242532f 100644
--- a/chromium/webkit/browser/fileapi/dragged_file_util.cc
+++ b/chromium/webkit/browser/fileapi/dragged_file_util.cc
@@ -81,7 +81,7 @@ PlatformFileError DraggedFileUtil::GetFileInfo(
}
base::PlatformFileError error =
NativeFileUtil::GetFileInfo(url.path(), file_info);
- if (file_util::IsLink(url.path()) && !base::FilePath().IsParent(url.path())) {
+ if (base::IsLink(url.path()) && !base::FilePath().IsParent(url.path())) {
// Don't follow symlinks unless it's the one that are selected by the user.
return base::PLATFORM_FILE_ERROR_NOT_FOUND;
}