diff options
Diffstat (limited to 'Source/WebCore/page/ChromeClient.h')
| -rw-r--r-- | Source/WebCore/page/ChromeClient.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h index 83f039f..42ef727 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -304,13 +304,11 @@ namespace WebCore { virtual void postAccessibilityNotification(AccessibilityObject*, AXObjectCache::AXNotification) { } -<<<<<<< HEAD + virtual void didCompleteRubberBandForMainFrame(const IntSize&) const { } + #if ENABLE(ANDROID_INSTALLABLE_WEB_APPS) virtual void webAppCanBeInstalled() = 0; #endif -======= - virtual void didCompleteRubberBandForMainFrame(const IntSize&) const { } ->>>>>>> webkit.org at r78450 protected: virtual ~ChromeClient() { } |