diff options
| author | Steve Block <steveblock@google.com> | 2010-04-29 15:11:20 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:14 +0100 |
| commit | 2c993a2e09dd5636c3c0b8113749ae3acabb575a (patch) | |
| tree | 34b450eb9858a270759a648af6af45d5cf72dbc0 /WebKit/android | |
| parent | 2328ced4730eaceb3fad20e9118763dc3c4c253d (diff) | |
| download | external_webkit-2c993a2e09dd5636c3c0b8113749ae3acabb575a.zip external_webkit-2c993a2e09dd5636c3c0b8113749ae3acabb575a.tar.gz external_webkit-2c993a2e09dd5636c3c0b8113749ae3acabb575a.tar.bz2 | |
Merge webkit.org at r58033 : Update ChromeClient::iconForFiles()
See http://trac.webkit.org/changeset/56439 and http://trac.webkit.org/changeset/57903
Change-Id: I9e05104b452804a74623b6b8e915dcaebf9cca7c
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 3 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index c9ddf6f..0d5fb09 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -38,6 +38,7 @@ #include "FrameView.h" #include "Geolocation.h" #include "GraphicsLayerAndroid.h" +#include "Icon.h" #include "Page.h" #include "Screen.h" #include "ScriptController.h" @@ -492,7 +493,7 @@ void ChromeClientAndroid::runOpenPanel(Frame* frame, core->openFileChooser(chooser); } -void ChromeClientAndroid::iconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>) +void ChromeClientAndroid::chooseIconForFiles(const Vector<WebCore::String>&, FileChooser*) { notImplemented(); } diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h index 210bef8..22901f9 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h @@ -151,7 +151,7 @@ namespace android { virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>); virtual bool setCursor(PlatformCursorHandle); - virtual void iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>); + virtual void chooseIconForFiles(const WTF::Vector<WebCore::String>&, FileChooser*); // Notification that the given form element has changed. This function // will be called frequently, so handling should be very fast. |