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