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 1795 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1806 else if (params.saveAs) | 1806 else if (params.saveAs) |
1807 ipc_params.mode = FileChooserParams::Save; | 1807 ipc_params.mode = FileChooserParams::Save; |
1808 else | 1808 else |
1809 ipc_params.mode = FileChooserParams::Open; | 1809 ipc_params.mode = FileChooserParams::Open; |
1810 ipc_params.title = params.title; | 1810 ipc_params.title = params.title; |
1811 ipc_params.default_file_name = | 1811 ipc_params.default_file_name = |
1812 base::FilePath::FromUTF16Unsafe(params.initialValue); | 1812 base::FilePath::FromUTF16Unsafe(params.initialValue); |
1813 ipc_params.accept_types.reserve(params.acceptTypes.size()); | 1813 ipc_params.accept_types.reserve(params.acceptTypes.size()); |
1814 for (size_t i = 0; i < params.acceptTypes.size(); ++i) | 1814 for (size_t i = 0; i < params.acceptTypes.size(); ++i) |
1815 ipc_params.accept_types.push_back(params.acceptTypes[i]); | 1815 ipc_params.accept_types.push_back(params.acceptTypes[i]); |
| 1816 ipc_params.need_local_path = params.needLocalPath; |
1816 #if defined(OS_ANDROID) | 1817 #if defined(OS_ANDROID) |
1817 ipc_params.capture = params.useMediaCapture; | 1818 ipc_params.capture = params.useMediaCapture; |
1818 #endif | 1819 #endif |
1819 | 1820 |
1820 return ScheduleFileChooser(ipc_params, chooser_completion); | 1821 return ScheduleFileChooser(ipc_params, chooser_completion); |
1821 } | 1822 } |
1822 | 1823 |
1823 void RenderViewImpl::SetValidationMessageDirection( | 1824 void RenderViewImpl::SetValidationMessageDirection( |
1824 base::string16* wrapped_main_text, | 1825 base::string16* wrapped_main_text, |
1825 blink::WebTextDirection main_text_hint, | 1826 blink::WebTextDirection main_text_hint, |
(...skipping 1185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3011 return; | 3012 return; |
3012 | 3013 |
3013 // Convert Chrome's SelectedFileInfo list to WebKit's. | 3014 // Convert Chrome's SelectedFileInfo list to WebKit's. |
3014 WebVector<WebFileChooserCompletion::SelectedFileInfo> selected_files( | 3015 WebVector<WebFileChooserCompletion::SelectedFileInfo> selected_files( |
3015 files.size()); | 3016 files.size()); |
3016 for (size_t i = 0; i < files.size(); ++i) { | 3017 for (size_t i = 0; i < files.size(); ++i) { |
3017 WebFileChooserCompletion::SelectedFileInfo selected_file; | 3018 WebFileChooserCompletion::SelectedFileInfo selected_file; |
3018 selected_file.path = files[i].file_path.AsUTF16Unsafe(); | 3019 selected_file.path = files[i].file_path.AsUTF16Unsafe(); |
3019 selected_file.displayName = | 3020 selected_file.displayName = |
3020 base::FilePath(files[i].display_name).AsUTF16Unsafe(); | 3021 base::FilePath(files[i].display_name).AsUTF16Unsafe(); |
| 3022 if (files[i].file_system_url.is_valid()) { |
| 3023 selected_file.fileSystemURL = files[i].file_system_url; |
| 3024 selected_file.length = files[i].length; |
| 3025 selected_file.modificationTime = files[i].modification_time.ToDoubleT(); |
| 3026 selected_file.isDirectory = files[i].is_directory; |
| 3027 } |
3021 selected_files[i] = selected_file; | 3028 selected_files[i] = selected_file; |
3022 } | 3029 } |
3023 | 3030 |
3024 if (file_chooser_completions_.front()->completion) | 3031 if (file_chooser_completions_.front()->completion) |
3025 file_chooser_completions_.front()->completion->didChooseFile( | 3032 file_chooser_completions_.front()->completion->didChooseFile( |
3026 selected_files); | 3033 selected_files); |
3027 file_chooser_completions_.pop_front(); | 3034 file_chooser_completions_.pop_front(); |
3028 | 3035 |
3029 // If there are more pending file chooser requests, schedule one now. | 3036 // If there are more pending file chooser requests, schedule one now. |
3030 if (!file_chooser_completions_.empty()) { | 3037 if (!file_chooser_completions_.empty()) { |
(...skipping 1164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4195 std::vector<gfx::Size> sizes; | 4202 std::vector<gfx::Size> sizes; |
4196 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4203 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4197 if (!url.isEmpty()) | 4204 if (!url.isEmpty()) |
4198 urls.push_back( | 4205 urls.push_back( |
4199 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4206 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4200 } | 4207 } |
4201 SendUpdateFaviconURL(urls); | 4208 SendUpdateFaviconURL(urls); |
4202 } | 4209 } |
4203 | 4210 |
4204 } // namespace content | 4211 } // namespace content |
OLD | NEW |