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 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
719 NotifyPopupOpeningObservers(); | 719 NotifyPopupOpeningObservers(); |
720 WebFrameClient* client = WebLocalFrameImpl::FromFrame(frame)->Client(); | 720 WebFrameClient* client = WebLocalFrameImpl::FromFrame(frame)->Client(); |
721 if (!client) | 721 if (!client) |
722 return; | 722 return; |
723 | 723 |
724 WebFileChooserParams params; | 724 WebFileChooserParams params; |
725 params.multi_select = file_chooser->GetSettings().allows_multiple_files; | 725 params.multi_select = file_chooser->GetSettings().allows_multiple_files; |
726 params.directory = file_chooser->GetSettings().allows_directory_upload; | 726 params.directory = file_chooser->GetSettings().allows_directory_upload; |
727 params.accept_types = file_chooser->GetSettings().AcceptTypes(); | 727 params.accept_types = file_chooser->GetSettings().AcceptTypes(); |
728 params.selected_files = file_chooser->GetSettings().selected_files; | 728 params.selected_files = file_chooser->GetSettings().selected_files; |
729 params.use_media_capture = file_chooser->GetSettings().use_media_capture; | 729 if (RuntimeEnabledFeatures::mediaCaptureEnabled()) |
| 730 params.capture = file_chooser->GetSettings().capture; |
| 731 else |
| 732 params.capture = WebString(); |
730 params.need_local_path = file_chooser->GetSettings().allows_directory_upload; | 733 params.need_local_path = file_chooser->GetSettings().allows_directory_upload; |
731 params.requestor = frame->GetDocument()->Url(); | 734 params.requestor = frame->GetDocument()->Url(); |
732 | 735 |
733 WebFileChooserCompletionImpl* chooser_completion = | 736 WebFileChooserCompletionImpl* chooser_completion = |
734 new WebFileChooserCompletionImpl(std::move(file_chooser)); | 737 new WebFileChooserCompletionImpl(std::move(file_chooser)); |
735 if (client->RunFileChooser(params, chooser_completion)) | 738 if (client->RunFileChooser(params, chooser_completion)) |
736 return; | 739 return; |
737 // Choosing failed, so do callback with an empty list. | 740 // Choosing failed, so do callback with an empty list. |
738 chooser_completion->DidChooseFile(WebVector<WebString>()); | 741 chooser_completion->DidChooseFile(WebVector<WebString>()); |
739 } | 742 } |
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1235 if (RuntimeEnabledFeatures::presentationEnabled()) | 1238 if (RuntimeEnabledFeatures::presentationEnabled()) |
1236 PresentationController::ProvideTo(frame, client->PresentationClient()); | 1239 PresentationController::ProvideTo(frame, client->PresentationClient()); |
1237 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { | 1240 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { |
1238 ProvideAudioOutputDeviceClientTo(frame, | 1241 ProvideAudioOutputDeviceClientTo(frame, |
1239 new AudioOutputDeviceClientImpl(frame)); | 1242 new AudioOutputDeviceClientImpl(frame)); |
1240 } | 1243 } |
1241 InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher()); | 1244 InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher()); |
1242 } | 1245 } |
1243 | 1246 |
1244 } // namespace blink | 1247 } // namespace blink |
OLD | NEW |