Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1774)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 1410423003: [SafeBrowsing] Conditionalize unverified download blocking on whitelist. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@flash-download-block
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1738 matching lines...) Expand 10 before | Expand all | Expand 10 after
1749 ipc_params.title = params.title; 1749 ipc_params.title = params.title;
1750 ipc_params.default_file_name = 1750 ipc_params.default_file_name =
1751 base::FilePath::FromUTF16Unsafe(params.initialValue).BaseName(); 1751 base::FilePath::FromUTF16Unsafe(params.initialValue).BaseName();
1752 ipc_params.accept_types.reserve(params.acceptTypes.size()); 1752 ipc_params.accept_types.reserve(params.acceptTypes.size());
1753 for (size_t i = 0; i < params.acceptTypes.size(); ++i) 1753 for (size_t i = 0; i < params.acceptTypes.size(); ++i)
1754 ipc_params.accept_types.push_back(params.acceptTypes[i]); 1754 ipc_params.accept_types.push_back(params.acceptTypes[i]);
1755 ipc_params.need_local_path = params.needLocalPath; 1755 ipc_params.need_local_path = params.needLocalPath;
1756 #if defined(OS_ANDROID) 1756 #if defined(OS_ANDROID)
1757 ipc_params.capture = params.useMediaCapture; 1757 ipc_params.capture = params.useMediaCapture;
1758 #endif 1758 #endif
1759 ipc_params.requestor = params.requestor;
1759 1760
1760 return ScheduleFileChooser(ipc_params, chooser_completion); 1761 return ScheduleFileChooser(ipc_params, chooser_completion);
1761 } 1762 }
1762 1763
1763 void RenderViewImpl::SetValidationMessageDirection( 1764 void RenderViewImpl::SetValidationMessageDirection(
1764 base::string16* wrapped_main_text, 1765 base::string16* wrapped_main_text,
1765 blink::WebTextDirection main_text_hint, 1766 blink::WebTextDirection main_text_hint,
1766 base::string16* wrapped_sub_text, 1767 base::string16* wrapped_sub_text,
1767 blink::WebTextDirection sub_text_hint) { 1768 blink::WebTextDirection sub_text_hint) {
1768 if (main_text_hint == blink::WebTextDirectionLeftToRight) { 1769 if (main_text_hint == blink::WebTextDirectionLeftToRight) {
(...skipping 1917 matching lines...) Expand 10 before | Expand all | Expand 10 after
3686 std::vector<gfx::Size> sizes; 3687 std::vector<gfx::Size> sizes;
3687 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 3688 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
3688 if (!url.isEmpty()) 3689 if (!url.isEmpty())
3689 urls.push_back( 3690 urls.push_back(
3690 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3691 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3691 } 3692 }
3692 SendUpdateFaviconURL(urls); 3693 SendUpdateFaviconURL(urls);
3693 } 3694 }
3694 3695
3695 } // namespace content 3696 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698