diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-11 11:36:28 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-17 13:36:00 -0800 |
| commit | 02f88d26cf0763bd684a752045695aaf902844bc (patch) | |
| tree | ab15c4e11d49158315c535bce8beca9d5386257e /WebKit/android/WebCoreSupport | |
| parent | cb9910a9a17c62fbba3be29d9f2fd951117c300e (diff) | |
| download | external_webkit-02f88d26cf0763bd684a752045695aaf902844bc.zip external_webkit-02f88d26cf0763bd684a752045695aaf902844bc.tar.gz external_webkit-02f88d26cf0763bd684a752045695aaf902844bc.tar.bz2 | |
Merge Webkit at r71558: Vitual function implementation in ChromeClientAndroid.*
http://trac.webkit.org/changeset/71041
Change-Id: Ifc88920a1cce9bf483d06a68a5ab4d23b63228d0
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 4 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index 172a8c9..8292fb2 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -191,6 +191,10 @@ bool ChromeClientAndroid::menubarVisible() { notImplemented(); return false; } void ChromeClientAndroid::setResizable(bool) { notImplemented(); } +#if ENABLE(CONTEXT_MENUS) +void ChromeClientAndroid::showContextMenu() { notImplemented(); } +#endif + // This function is called by the JavaScript bindings to print usually an error to // a message console. Pass the message to the java side so that the client can // handle it as it sees fit. diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h index f5d8782..18f6916 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h @@ -177,6 +177,10 @@ namespace android { virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const; virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const; +#if ENABLE(CONTEXT_MENUS) + virtual void showContextMenu(); +#endif + #if ENABLE(ANDROID_INSTALLABLE_WEB_APPS) virtual void webAppCanBeInstalled(); #endif |