OLD | NEW |
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 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
610 if (!client) | 610 if (!client) |
611 return; | 611 return; |
612 | 612 |
613 WebFileChooserParams params; | 613 WebFileChooserParams params; |
614 params.multiSelect = fileChooser->settings().allowsMultipleFiles; | 614 params.multiSelect = fileChooser->settings().allowsMultipleFiles; |
615 params.directory = fileChooser->settings().allowsDirectoryUpload; | 615 params.directory = fileChooser->settings().allowsDirectoryUpload; |
616 params.acceptTypes = fileChooser->settings().acceptTypes(); | 616 params.acceptTypes = fileChooser->settings().acceptTypes(); |
617 params.selectedFiles = fileChooser->settings().selectedFiles; | 617 params.selectedFiles = fileChooser->settings().selectedFiles; |
618 if (params.selectedFiles.size() > 0) | 618 if (params.selectedFiles.size() > 0) |
619 params.initialValue = params.selectedFiles[0]; | 619 params.initialValue = params.selectedFiles[0]; |
620 #if ENABLE(MEDIA_CAPTURE) | |
621 params.useMediaCapture = fileChooser->settings().useMediaCapture; | 620 params.useMediaCapture = fileChooser->settings().useMediaCapture; |
622 #endif | 621 |
623 WebFileChooserCompletionImpl* chooserCompletion = | 622 WebFileChooserCompletionImpl* chooserCompletion = |
624 new WebFileChooserCompletionImpl(fileChooser); | 623 new WebFileChooserCompletionImpl(fileChooser); |
625 | 624 |
626 if (client->runFileChooser(params, chooserCompletion)) | 625 if (client->runFileChooser(params, chooserCompletion)) |
627 return; | 626 return; |
628 | 627 |
629 // Choosing failed, so do callback with an empty list. | 628 // Choosing failed, so do callback with an empty list. |
630 chooserCompletion->didChooseFile(WebVector<WebString>()); | 629 chooserCompletion->didChooseFile(WebVector<WebString>()); |
631 } | 630 } |
632 | 631 |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
873 m_webView->autofillClient()->textFieldDidEndEditing(WebInputElement(&inp
utElement)); | 872 m_webView->autofillClient()->textFieldDidEndEditing(WebInputElement(&inp
utElement)); |
874 } | 873 } |
875 | 874 |
876 void ChromeClientImpl::openTextDataListChooser(HTMLInputElement& input) | 875 void ChromeClientImpl::openTextDataListChooser(HTMLInputElement& input) |
877 { | 876 { |
878 if (m_webView->autofillClient()) | 877 if (m_webView->autofillClient()) |
879 m_webView->autofillClient()->openTextDataListChooser(WebInputElement(&in
put)); | 878 m_webView->autofillClient()->openTextDataListChooser(WebInputElement(&in
put)); |
880 } | 879 } |
881 | 880 |
882 } // namespace blink | 881 } // namespace blink |
OLD | NEW |