| 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 1743 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1754 ipc_params.title = params.title; | 1754 ipc_params.title = params.title; |
| 1755 ipc_params.default_file_name = | 1755 ipc_params.default_file_name = |
| 1756 base::FilePath::FromUTF16Unsafe(params.initialValue).BaseName(); | 1756 base::FilePath::FromUTF16Unsafe(params.initialValue).BaseName(); |
| 1757 ipc_params.accept_types.reserve(params.acceptTypes.size()); | 1757 ipc_params.accept_types.reserve(params.acceptTypes.size()); |
| 1758 for (size_t i = 0; i < params.acceptTypes.size(); ++i) | 1758 for (size_t i = 0; i < params.acceptTypes.size(); ++i) |
| 1759 ipc_params.accept_types.push_back(params.acceptTypes[i]); | 1759 ipc_params.accept_types.push_back(params.acceptTypes[i]); |
| 1760 ipc_params.need_local_path = params.needLocalPath; | 1760 ipc_params.need_local_path = params.needLocalPath; |
| 1761 #if defined(OS_ANDROID) | 1761 #if defined(OS_ANDROID) |
| 1762 ipc_params.capture = params.useMediaCapture; | 1762 ipc_params.capture = params.useMediaCapture; |
| 1763 #endif | 1763 #endif |
| 1764 ipc_params.requestor = params.requestor; |
| 1764 | 1765 |
| 1765 return ScheduleFileChooser(ipc_params, chooser_completion); | 1766 return ScheduleFileChooser(ipc_params, chooser_completion); |
| 1766 } | 1767 } |
| 1767 | 1768 |
| 1768 void RenderViewImpl::SetValidationMessageDirection( | 1769 void RenderViewImpl::SetValidationMessageDirection( |
| 1769 base::string16* wrapped_main_text, | 1770 base::string16* wrapped_main_text, |
| 1770 blink::WebTextDirection main_text_hint, | 1771 blink::WebTextDirection main_text_hint, |
| 1771 base::string16* wrapped_sub_text, | 1772 base::string16* wrapped_sub_text, |
| 1772 blink::WebTextDirection sub_text_hint) { | 1773 blink::WebTextDirection sub_text_hint) { |
| 1773 if (main_text_hint == blink::WebTextDirectionLeftToRight) { | 1774 if (main_text_hint == blink::WebTextDirectionLeftToRight) { |
| (...skipping 1923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3697 std::vector<gfx::Size> sizes; | 3698 std::vector<gfx::Size> sizes; |
| 3698 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3699 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 3699 if (!url.isEmpty()) | 3700 if (!url.isEmpty()) |
| 3700 urls.push_back( | 3701 urls.push_back( |
| 3701 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3702 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 3702 } | 3703 } |
| 3703 SendUpdateFaviconURL(urls); | 3704 SendUpdateFaviconURL(urls); |
| 3704 } | 3705 } |
| 3705 | 3706 |
| 3706 } // namespace content | 3707 } // namespace content |
| OLD | NEW |