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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 817103002: Only take basename of default_file_name when starting a File Chooser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: change to filter at the IPC Created 5 years, 12 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1724 matching lines...) Expand 10 before | Expand all | Expand 10 after
1735 if (params.directory) 1735 if (params.directory)
1736 ipc_params.mode = FileChooserParams::UploadFolder; 1736 ipc_params.mode = FileChooserParams::UploadFolder;
1737 else if (params.multiSelect) 1737 else if (params.multiSelect)
1738 ipc_params.mode = FileChooserParams::OpenMultiple; 1738 ipc_params.mode = FileChooserParams::OpenMultiple;
1739 else if (params.saveAs) 1739 else if (params.saveAs)
1740 ipc_params.mode = FileChooserParams::Save; 1740 ipc_params.mode = FileChooserParams::Save;
1741 else 1741 else
1742 ipc_params.mode = FileChooserParams::Open; 1742 ipc_params.mode = FileChooserParams::Open;
1743 ipc_params.title = params.title; 1743 ipc_params.title = params.title;
1744 ipc_params.default_file_name = 1744 ipc_params.default_file_name =
1745 base::FilePath::FromUTF16Unsafe(params.initialValue); 1745 base::FilePath::FromUTF16Unsafe(params.initialValue).BaseName();
1746 ipc_params.accept_types.reserve(params.acceptTypes.size()); 1746 ipc_params.accept_types.reserve(params.acceptTypes.size());
1747 for (size_t i = 0; i < params.acceptTypes.size(); ++i) 1747 for (size_t i = 0; i < params.acceptTypes.size(); ++i)
1748 ipc_params.accept_types.push_back(params.acceptTypes[i]); 1748 ipc_params.accept_types.push_back(params.acceptTypes[i]);
1749 ipc_params.need_local_path = params.needLocalPath; 1749 ipc_params.need_local_path = params.needLocalPath;
1750 #if defined(OS_ANDROID) 1750 #if defined(OS_ANDROID)
1751 ipc_params.capture = params.useMediaCapture; 1751 ipc_params.capture = params.useMediaCapture;
1752 #endif 1752 #endif
1753 1753
1754 return ScheduleFileChooser(ipc_params, chooser_completion); 1754 return ScheduleFileChooser(ipc_params, chooser_completion);
1755 } 1755 }
(...skipping 2335 matching lines...) Expand 10 before | Expand all | Expand 10 after
4091 std::vector<gfx::Size> sizes; 4091 std::vector<gfx::Size> sizes;
4092 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4092 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4093 if (!url.isEmpty()) 4093 if (!url.isEmpty())
4094 urls.push_back( 4094 urls.push_back(
4095 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4095 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4096 } 4096 }
4097 SendUpdateFaviconURL(urls); 4097 SendUpdateFaviconURL(urls);
4098 } 4098 }
4099 4099
4100 } // namespace content 4100 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698