diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 05:15:45 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 05:15:45 +0000 |
| commit | 79f6388902881a0aab426e9606c544b68ab3b9bc (patch) | |
| tree | df8da7e82fded47bccf4fe32922a8451a475bf97 /win8/metro_driver/file_picker.cc | |
| parent | 6d4b67a4b50d73d5001aec99014ac40bc504871a (diff) | |
| download | chromium_src-79f6388902881a0aab426e9606c544b68ab3b9bc.zip chromium_src-79f6388902881a0aab426e9606c544b68ab3b9bc.tar.gz chromium_src-79f6388902881a0aab426e9606c544b68ab3b9bc.tar.bz2 | |
Replace FilePath with base::FilePath in some more top level directories.
Review URL: https://codereview.chromium.org/12217101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver/file_picker.cc')
| -rw-r--r-- | win8/metro_driver/file_picker.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win8/metro_driver/file_picker.cc b/win8/metro_driver/file_picker.cc index 71bd8fc..4979f4c 100644 --- a/win8/metro_driver/file_picker.cc +++ b/win8/metro_driver/file_picker.cc @@ -319,7 +319,7 @@ HRESULT OpenFilePickerSession::StartFilePicker() { hr = extension.Set(L"*"); } else { // Metro wants suffixes only, not patterns. - string16 ext = FilePath(extensions_win32_style[i]).Extension(); + string16 ext = base::FilePath(extensions_win32_style[i]).Extension(); if ((ext.size() < 2) || (ext.find_first_of(L"*?") != string16::npos)) { continue; @@ -391,7 +391,7 @@ HRESULT OpenFilePickerSession::ComposeMultiFileResult( } // This stores the base path that should be the parent of all the files. - FilePath base_path; + base::FilePath base_path; // Iterate through the collection and append the file paths to the result. for (unsigned int i = 0; i < num_files; ++i) { @@ -410,7 +410,7 @@ HRESULT OpenFilePickerSession::ComposeMultiFileResult( if (FAILED(hr)) return hr; - FilePath file_path(MakeStdWString(file_path_str.Get())); + base::FilePath file_path(MakeStdWString(file_path_str.Get())); if (base_path.empty()) { DCHECK(result->empty()); base_path = file_path.DirName(); @@ -424,7 +424,7 @@ HRESULT OpenFilePickerSession::ComposeMultiFileResult( DCHECK(base_path == file_path.DirName()); // Append the base name, including the terminating zero. - FilePath base_name = file_path.BaseName(); + base::FilePath base_name = file_path.BaseName(); result->append(base_name.value().c_str(), base_name.value().size() + 1); } @@ -484,7 +484,7 @@ HRESULT SaveFilePickerSession::StartFilePicker() { // the all files ("*") pattern in the save picker. std::vector<string16> extensions; for (size_t i = 0; i < extensions_win32_style.size(); ++i) { - string16 ext = FilePath(extensions_win32_style[i]).Extension(); + string16 ext = base::FilePath(extensions_win32_style[i]).Extension(); if ((ext.size() < 2) || (ext.find_first_of(L"*?") != string16::npos)) continue; |