| OLD | NEW |
| 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 1739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1750 if (params.directory) | 1750 if (params.directory) |
| 1751 ipc_params.mode = FileChooserParams::UploadFolder; | 1751 ipc_params.mode = FileChooserParams::UploadFolder; |
| 1752 else if (params.multiSelect) | 1752 else if (params.multiSelect) |
| 1753 ipc_params.mode = FileChooserParams::OpenMultiple; | 1753 ipc_params.mode = FileChooserParams::OpenMultiple; |
| 1754 else if (params.saveAs) | 1754 else if (params.saveAs) |
| 1755 ipc_params.mode = FileChooserParams::Save; | 1755 ipc_params.mode = FileChooserParams::Save; |
| 1756 else | 1756 else |
| 1757 ipc_params.mode = FileChooserParams::Open; | 1757 ipc_params.mode = FileChooserParams::Open; |
| 1758 ipc_params.title = params.title; | 1758 ipc_params.title = params.title; |
| 1759 ipc_params.default_file_name = | 1759 ipc_params.default_file_name = |
| 1760 base::FilePath::FromUTF16Unsafe(params.initialValue); | 1760 base::FilePath::FromUTF16Unsafe(params.initialValue).BaseName(); |
| 1761 ipc_params.accept_types.reserve(params.acceptTypes.size()); | 1761 ipc_params.accept_types.reserve(params.acceptTypes.size()); |
| 1762 for (size_t i = 0; i < params.acceptTypes.size(); ++i) | 1762 for (size_t i = 0; i < params.acceptTypes.size(); ++i) |
| 1763 ipc_params.accept_types.push_back(params.acceptTypes[i]); | 1763 ipc_params.accept_types.push_back(params.acceptTypes[i]); |
| 1764 ipc_params.need_local_path = params.needLocalPath; | 1764 ipc_params.need_local_path = params.needLocalPath; |
| 1765 #if defined(OS_ANDROID) | 1765 #if defined(OS_ANDROID) |
| 1766 ipc_params.capture = params.useMediaCapture; | 1766 ipc_params.capture = params.useMediaCapture; |
| 1767 #endif | 1767 #endif |
| 1768 | 1768 |
| 1769 return ScheduleFileChooser(ipc_params, chooser_completion); | 1769 return ScheduleFileChooser(ipc_params, chooser_completion); |
| 1770 } | 1770 } |
| (...skipping 2291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4062 std::vector<gfx::Size> sizes; | 4062 std::vector<gfx::Size> sizes; |
| 4063 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4063 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4064 if (!url.isEmpty()) | 4064 if (!url.isEmpty()) |
| 4065 urls.push_back( | 4065 urls.push_back( |
| 4066 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4066 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4067 } | 4067 } |
| 4068 SendUpdateFaviconURL(urls); | 4068 SendUpdateFaviconURL(urls); |
| 4069 } | 4069 } |
| 4070 | 4070 |
| 4071 } // namespace content | 4071 } // namespace content |
| OLD | NEW |