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

Unified Diff: content/browser/web_contents/web_contents_drag_win.cc

Issue 12213066: Use base namespace for FilePath in content/browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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_contents_drag_win.cc
diff --git a/content/browser/web_contents/web_contents_drag_win.cc b/content/browser/web_contents/web_contents_drag_win.cc
index adc4cec9d285dabf340345e88a4028956ab9192d..32dcb69dbd5464b8e1045a61e0d4d24ed90c327b 100644
--- a/content/browser/web_contents/web_contents_drag_win.cc
+++ b/content/browser/web_contents/web_contents_drag_win.cc
@@ -225,7 +225,7 @@ void WebContentsDragWin::PrepareDragForDownload(
const std::string& page_encoding) {
// Parse the download metadata.
string16 mime_type;
- FilePath file_name;
+ base::FilePath file_name;
GURL download_url;
if (!ParseDownloadMetadata(drop_data.download_metadata,
&mime_type,
@@ -236,18 +236,19 @@ void WebContentsDragWin::PrepareDragForDownload(
// Generate the file name based on both mime type and proposed file name.
std::string default_name =
GetContentClient()->browser()->GetDefaultDownloadName();
- FilePath generated_download_file_name =
+ base::FilePath generated_download_file_name =
net::GenerateFileName(download_url,
std::string(),
std::string(),
UTF16ToUTF8(file_name.value()),
UTF16ToUTF8(mime_type),
default_name);
- FilePath temp_dir_path;
+ base::FilePath temp_dir_path;
if (!file_util::CreateNewTempDirectory(
FILE_PATH_LITERAL("chrome_drag"), &temp_dir_path))
return;
- FilePath download_path = temp_dir_path.Append(generated_download_file_name);
+ base::FilePath download_path =
+ temp_dir_path.Append(generated_download_file_name);
// We cannot know when the target application will be done using the temporary
// file, so schedule it to be deleted after rebooting.
@@ -264,7 +265,7 @@ void WebContentsDragWin::PrepareDragForDownload(
Referrer(page_url, drop_data.referrer_policy),
page_encoding,
web_contents_);
- ui::OSExchangeData::DownloadFileInfo file_download(FilePath(),
+ ui::OSExchangeData::DownloadFileInfo file_download(base::FilePath(),
download_file.get());
data->SetDownloadFileInfo(file_download);
@@ -275,17 +276,17 @@ void WebContentsDragWin::PrepareDragForDownload(
void WebContentsDragWin::PrepareDragForFileContents(
const WebDropData& drop_data, ui::OSExchangeData* data) {
static const int kMaxFilenameLength = 255; // FAT and NTFS
- FilePath file_name(drop_data.file_description_filename);
+ base::FilePath file_name(drop_data.file_description_filename);
// Images without ALT text will only have a file extension so we need to
// synthesize one from the provided extension and URL.
if (file_name.BaseName().RemoveExtension().empty()) {
const string16 extension = file_name.Extension();
// Retrieve the name from the URL.
- file_name = FilePath(
+ file_name = base::FilePath(
net::GetSuggestedFilename(drop_data.url, "", "", "", "", ""));
if (file_name.value().size() + extension.size() > kMaxFilenameLength) {
- file_name = FilePath(file_name.value().substr(
+ file_name = base::FilePath(file_name.value().substr(
0, kMaxFilenameLength - extension.size()));
}
file_name = file_name.ReplaceExtension(extension);
« no previous file with comments | « content/browser/web_contents/navigation_controller_impl_unittest.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698