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 2362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2373 } | 2373 } |
2374 | 2374 |
2375 bool RenderViewImpl::runFileChooser( | 2375 bool RenderViewImpl::runFileChooser( |
2376 const WebKit::WebFileChooserParams& params, | 2376 const WebKit::WebFileChooserParams& params, |
2377 WebFileChooserCompletion* chooser_completion) { | 2377 WebFileChooserCompletion* chooser_completion) { |
2378 // Do not open the file dialog in a hidden RenderView. | 2378 // Do not open the file dialog in a hidden RenderView. |
2379 if (is_hidden()) | 2379 if (is_hidden()) |
2380 return false; | 2380 return false; |
2381 FileChooserParams ipc_params; | 2381 FileChooserParams ipc_params; |
2382 if (params.directory) | 2382 if (params.directory) |
2383 ipc_params.mode = FileChooserParams::OpenFolder; | 2383 ipc_params.mode = FileChooserParams::UploadFolder; |
2384 else if (params.multiSelect) | 2384 else if (params.multiSelect) |
2385 ipc_params.mode = FileChooserParams::OpenMultiple; | 2385 ipc_params.mode = FileChooserParams::OpenMultiple; |
2386 else if (params.saveAs) | 2386 else if (params.saveAs) |
2387 ipc_params.mode = FileChooserParams::Save; | 2387 ipc_params.mode = FileChooserParams::Save; |
2388 else | 2388 else |
2389 ipc_params.mode = FileChooserParams::Open; | 2389 ipc_params.mode = FileChooserParams::Open; |
2390 ipc_params.title = params.title; | 2390 ipc_params.title = params.title; |
2391 ipc_params.default_file_name = | 2391 ipc_params.default_file_name = |
2392 base::FilePath::FromUTF16Unsafe(params.initialValue); | 2392 base::FilePath::FromUTF16Unsafe(params.initialValue); |
2393 ipc_params.accept_types.reserve(params.acceptTypes.size()); | 2393 ipc_params.accept_types.reserve(params.acceptTypes.size()); |
(...skipping 4390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6784 WebURL url = icon_urls[i].iconURL(); | 6784 WebURL url = icon_urls[i].iconURL(); |
6785 if (!url.isEmpty()) | 6785 if (!url.isEmpty()) |
6786 urls.push_back(FaviconURL(url, | 6786 urls.push_back(FaviconURL(url, |
6787 ToFaviconType(icon_urls[i].iconType()))); | 6787 ToFaviconType(icon_urls[i].iconType()))); |
6788 } | 6788 } |
6789 SendUpdateFaviconURL(urls); | 6789 SendUpdateFaviconURL(urls); |
6790 } | 6790 } |
6791 | 6791 |
6792 | 6792 |
6793 } // namespace content | 6793 } // namespace content |
OLD | NEW |