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

Side by Side Diff: third_party/WebKit/Source/web/ChromeClientImpl.cpp

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 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 620
621 WebFileChooserParams params; 621 WebFileChooserParams params;
622 params.multiSelect = fileChooser->settings().allowsMultipleFiles; 622 params.multiSelect = fileChooser->settings().allowsMultipleFiles;
623 params.directory = fileChooser->settings().allowsDirectoryUpload; 623 params.directory = fileChooser->settings().allowsDirectoryUpload;
624 params.acceptTypes = fileChooser->settings().acceptTypes(); 624 params.acceptTypes = fileChooser->settings().acceptTypes();
625 params.selectedFiles = fileChooser->settings().selectedFiles; 625 params.selectedFiles = fileChooser->settings().selectedFiles;
626 if (params.selectedFiles.size() > 0) 626 if (params.selectedFiles.size() > 0)
627 params.initialValue = params.selectedFiles[0]; 627 params.initialValue = params.selectedFiles[0];
628 params.useMediaCapture = fileChooser->settings().useMediaCapture; 628 params.useMediaCapture = fileChooser->settings().useMediaCapture;
629 params.needLocalPath = fileChooser->settings().allowsDirectoryUpload; 629 params.needLocalPath = fileChooser->settings().allowsDirectoryUpload;
630 params.requestor = frame->document()->url();
630 631
631 WebFileChooserCompletionImpl* chooserCompletion = new WebFileChooserCompleti onImpl(fileChooser); 632 WebFileChooserCompletionImpl* chooserCompletion = new WebFileChooserCompleti onImpl(fileChooser);
632 if (client->runFileChooser(params, chooserCompletion)) 633 if (client->runFileChooser(params, chooserCompletion))
633 return; 634 return;
634 // Choosing failed, so do callback with an empty list. 635 // Choosing failed, so do callback with an empty list.
635 chooserCompletion->didChooseFile(WebVector<WebString>()); 636 chooserCompletion->didChooseFile(WebVector<WebString>());
636 } 637 }
637 638
638 void ChromeClientImpl::enumerateChosenDirectory(FileChooser* fileChooser) 639 void ChromeClientImpl::enumerateChosenDirectory(FileChooser* fileChooser)
639 { 640 {
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 return m_webView->elasticOverscroll(); 1002 return m_webView->elasticOverscroll();
1002 } 1003 }
1003 1004
1004 void ChromeClientImpl::didObserveNonGetFetchFromScript() const 1005 void ChromeClientImpl::didObserveNonGetFetchFromScript() const
1005 { 1006 {
1006 if (m_webView->pageImportanceSignals()) 1007 if (m_webView->pageImportanceSignals())
1007 m_webView->pageImportanceSignals()->setIssuedNonGetFetchFromScript(); 1008 m_webView->pageImportanceSignals()->setIssuedNonGetFetchFromScript();
1008 } 1009 }
1009 1010
1010 } // namespace blink 1011 } // namespace blink
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | third_party/WebKit/public/web/WebFileChooserParams.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698