diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 21:36:12 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 21:36:12 +0000 |
| commit | 5e183ded3525704427b862268f08439543bf6aa5 (patch) | |
| tree | b4a5bd662cc352a0d3496b32ab7fc94b30a30224 /ui/base/dragdrop | |
| parent | 61731fe5a94e74fc1c4df426d0868da8b0d7a061 (diff) | |
| download | chromium_src-5e183ded3525704427b862268f08439543bf6aa5.zip chromium_src-5e183ded3525704427b862268f08439543bf6aa5.tar.gz chromium_src-5e183ded3525704427b862268f08439543bf6aa5.tar.bz2 | |
wstring: make net::GetSuggestedFilename return utf-16
We should only use FilePath when working with real paths on disk.
Note: I made a minor semantic change to downloads -- we no
longer preserve backslashes in server-suggested paths on non-Windows.
I think the previous behavior is crazy but from looking at the
blame I'm the one who wrote it originally, so I don't feel bad
about changing my mind.
BUG=69467
TEST=existing test still passes
Review URL: http://codereview.chromium.org/6241001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/dragdrop')
| -rw-r--r-- | ui/base/dragdrop/os_exchange_data_provider_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc index 657a917..22a4e62 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_win.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc @@ -844,8 +844,8 @@ static void CreateValidFileNameFromTitle(const GURL& url, std::wstring* validated) { if (title.empty()) { if (url.is_valid()) { - *validated = net::GetSuggestedFilename( - url, std::string(), std::string(), FilePath()).ToWStringHack(); + *validated = UTF16ToWide( + net::GetSuggestedFilename(url, "", "", string16())); } else { // Nothing else can be done, just use a default. *validated = |