| 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 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 { | 677 { |
| 678 notifyPopupOpeningObservers(); | 678 notifyPopupOpeningObservers(); |
| 679 if (RuntimeEnabledFeatures::inputMultipleFieldsUIEnabled()) | 679 if (RuntimeEnabledFeatures::inputMultipleFieldsUIEnabled()) |
| 680 return DateTimeChooserImpl::create(this, pickerClient, parameters); | 680 return DateTimeChooserImpl::create(this, pickerClient, parameters); |
| 681 return ExternalDateTimeChooser::create(this, m_webView->client(), pickerClie
nt, parameters); | 681 return ExternalDateTimeChooser::create(this, m_webView->client(), pickerClie
nt, parameters); |
| 682 } | 682 } |
| 683 | 683 |
| 684 void ChromeClientImpl::openFileChooser(LocalFrame* frame, PassRefPtr<FileChooser
> fileChooser) | 684 void ChromeClientImpl::openFileChooser(LocalFrame* frame, PassRefPtr<FileChooser
> fileChooser) |
| 685 { | 685 { |
| 686 notifyPopupOpeningObservers(); | 686 notifyPopupOpeningObservers(); |
| 687 WebViewClient* client = m_webView->client(); | 687 WebFrameClient* client = WebLocalFrameImpl::fromFrame(frame)->client(); |
| 688 if (!client) | 688 if (!client) |
| 689 return; | 689 return; |
| 690 | 690 |
| 691 WebFileChooserParams params; | 691 WebFileChooserParams params; |
| 692 params.multiSelect = fileChooser->settings().allowsMultipleFiles; | 692 params.multiSelect = fileChooser->settings().allowsMultipleFiles; |
| 693 params.directory = fileChooser->settings().allowsDirectoryUpload; | 693 params.directory = fileChooser->settings().allowsDirectoryUpload; |
| 694 params.acceptTypes = fileChooser->settings().acceptTypes(); | 694 params.acceptTypes = fileChooser->settings().acceptTypes(); |
| 695 params.selectedFiles = fileChooser->settings().selectedFiles; | 695 params.selectedFiles = fileChooser->settings().selectedFiles; |
| 696 if (params.selectedFiles.size() > 0) | 696 if (params.selectedFiles.size() > 0) |
| 697 params.initialValue = params.selectedFiles[0]; | 697 params.initialValue = params.selectedFiles[0]; |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1117 { | 1117 { |
| 1118 return adoptPtr(m_webView->scheduler()->createFrameScheduler(blameContext).r
elease()); | 1118 return adoptPtr(m_webView->scheduler()->createFrameScheduler(blameContext).r
elease()); |
| 1119 } | 1119 } |
| 1120 | 1120 |
| 1121 double ChromeClientImpl::lastFrameTimeMonotonic() const | 1121 double ChromeClientImpl::lastFrameTimeMonotonic() const |
| 1122 { | 1122 { |
| 1123 return m_webView->lastFrameTimeMonotonic(); | 1123 return m_webView->lastFrameTimeMonotonic(); |
| 1124 } | 1124 } |
| 1125 | 1125 |
| 1126 } // namespace blink | 1126 } // namespace blink |
| OLD | NEW |