diff options
Diffstat (limited to 'WebCore/page/ChromeClient.h')
| -rw-r--r-- | WebCore/page/ChromeClient.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h index c6555b9..bf6c157 100644 --- a/WebCore/page/ChromeClient.h +++ b/WebCore/page/ChromeClient.h @@ -270,13 +270,11 @@ namespace WebCore { virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const = 0; virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const = 0; -<<<<<<< HEAD + virtual void postAccessibilityNotification(AccessibilityObject*, AXObjectCache::AXNotification) { } + #if ENABLE(ANDROID_INSTALLABLE_WEB_APPS) virtual void webAppCanBeInstalled() = 0; #endif -======= - virtual void postAccessibilityNotification(AccessibilityObject*, AXObjectCache::AXNotification) { } ->>>>>>> webkit.org at r68651 protected: virtual ~ChromeClient() { } |