diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
| commit | 2a99a7e74a7f215066514fe81d2bfa6639d9eddd (patch) | |
| tree | 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae /content/browser/safe_util_win.cc | |
| parent | 61c449bbbb53310a8c041d8cefdd6b01a126cc7e (diff) | |
| download | chromium_org-2a99a7e74a7f215066514fe81d2bfa6639d9eddd.tar.gz | |
Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
Diffstat (limited to 'content/browser/safe_util_win.cc')
| -rw-r--r-- | content/browser/safe_util_win.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/safe_util_win.cc b/content/browser/safe_util_win.cc index f17c346f10..700f4b34c4 100644 --- a/content/browser/safe_util_win.cc +++ b/content/browser/safe_util_win.cc @@ -7,7 +7,7 @@ #include "content/browser/safe_util_win.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" @@ -31,7 +31,7 @@ static const GUID kClientID = { 0x2676a9a2, 0xd919, 0x4fee, // This function does not invoke Windows Attachment Execution Services. // // |full_path| is the path to the downloaded file. -bool SetInternetZoneIdentifierDirectly(const FilePath& full_path) { +bool SetInternetZoneIdentifierDirectly(const base::FilePath& full_path) { const DWORD kShare = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; std::wstring path = full_path.value() + L":Zone.Identifier"; HANDLE file = CreateFile(path.c_str(), GENERIC_WRITE, kShare, NULL, @@ -63,7 +63,7 @@ bool SetInternetZoneIdentifierDirectly(const FilePath& full_path) { // more information at: // http://msdn2.microsoft.com/en-us/library/ms647048.aspx bool SaferOpenItemViaShell(HWND hwnd, const std::wstring& window_title, - const FilePath& full_path, + const base::FilePath& full_path, const std::wstring& source_url) { base::win::ScopedComPtr<IAttachmentExecute> attachment_services; HRESULT hr = attachment_services.CreateInstance(CLSID_AttachmentServices); @@ -119,7 +119,7 @@ bool SaferOpenItemViaShell(HWND hwnd, const std::wstring& window_title, return ui::win::OpenItemViaShellNoZoneCheck(full_path); } -HRESULT ScanAndSaveDownloadedFile(const FilePath& full_path, +HRESULT ScanAndSaveDownloadedFile(const base::FilePath& full_path, const GURL& source_url) { base::win::ScopedComPtr<IAttachmentExecute> attachment_services; HRESULT hr = attachment_services.CreateInstance(CLSID_AttachmentServices); |