diff options
| author | Steve Block <steveblock@google.com> | 2010-04-25 18:35:18 -0700 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-04-27 17:09:06 +0100 |
| commit | e55806d9d9fe6be5bb3ee076392f2803ff0179f9 (patch) | |
| tree | 40fe9486336fe5784a86d51cfd0f00ee83974a60 /WebKit/android/WebCoreSupport | |
| parent | 54fa025dc9695e2409a9fa584379b83ee5d06d87 (diff) | |
| download | external_webkit-e55806d9d9fe6be5bb3ee076392f2803ff0179f9.zip external_webkit-e55806d9d9fe6be5bb3ee076392f2803ff0179f9.tar.gz external_webkit-e55806d9d9fe6be5bb3ee076392f2803ff0179f9.tar.bz2 | |
Merge webkit.org at r55033 : Implement new ChromeClient::iconForFiles method for Android
See http://trac.webkit.org/changeset/54923
Change-Id: I4f163c9716ca5e01b24f04337cf6c813e9faf0f7
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 5 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index c258d79..6d912fd 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -492,6 +492,11 @@ void ChromeClientAndroid::runOpenPanel(Frame* frame, core->openFileChooser(chooser); } +void ChromeClientAndroid::iconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>) +{ + notImplemented(); +} + bool ChromeClientAndroid::setCursor(PlatformCursorHandle) { notImplemented(); diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h index 68cac24..2797bc9 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h @@ -151,6 +151,7 @@ namespace android { virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>); virtual bool setCursor(PlatformCursorHandle); + virtual void iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>); // Notification that the given form element has changed. This function // will be called frequently, so handling should be very fast. |