From 2c993a2e09dd5636c3c0b8113749ae3acabb575a Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Thu, 29 Apr 2010 15:11:20 +0100
Subject: 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
---
 WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 3 ++-
 WebKit/android/WebCoreSupport/ChromeClientAndroid.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'WebKit/android')

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.
-- 
cgit v1.1