summaryrefslogtreecommitdiffstats
path: root/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-08-04 18:47:17 +0100
committerSteve Block <steveblock@google.com>2010-08-09 13:25:52 +0100
commit9e4593fcc93d1bf0b5d5aa00b17ed2177c8eed06 (patch)
tree0ce8259552b73f59cfc5292e1b820604e3756896 /WebKit/android/WebCoreSupport/ChromeClientAndroid.h
parent682e1f7af5f0d8201ed8fbb0751a88c8a3ec412b (diff)
downloadexternal_webkit-9e4593fcc93d1bf0b5d5aa00b17ed2177c8eed06.zip
external_webkit-9e4593fcc93d1bf0b5d5aa00b17ed2177c8eed06.tar.gz
external_webkit-9e4593fcc93d1bf0b5d5aa00b17ed2177c8eed06.tar.bz2
Merge WebKit at r64523 : Provide PopupMenuAndroid and related ChromeClient methods
See http://trac.webkit.org/changeset/64513 Change-Id: I9f55ae27989f7a246c0c1e5f771677c66a9b1556
Diffstat (limited to 'WebKit/android/WebCoreSupport/ChromeClientAndroid.h')
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index 65dcd81..8fe01dd 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -29,11 +29,15 @@
#include "ChromeClient.h"
#include "GeolocationPermissions.h"
+#include "PopupMenu.h"
+#include "SearchPopupMenu.h"
#include "Timer.h"
+#include <wtf/PassRefPtr.h>
#include <wtf/Threading.h>
namespace WebCore {
- class Geolocation;
+class PopupMenuClient;
+class Geolocation;
}
using namespace WebCore;
@@ -168,6 +172,10 @@ namespace android {
WebCore::GraphicsLayer* layersSync();
#endif
+ virtual bool selectItemWritingDirectionIsNatural();
+ virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;
+ virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;
+
#if ENABLE(ANDROID_INSTALLABLE_WEB_APPS)
virtual void webAppCanBeInstalled();
#endif