diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit2/UIProcess/WebUIClient.h | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit2/UIProcess/WebUIClient.h')
-rw-r--r-- | Source/WebKit2/UIProcess/WebUIClient.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/WebUIClient.h b/Source/WebKit2/UIProcess/WebUIClient.h index d8e0bff..ed47f8f 100644 --- a/Source/WebKit2/UIProcess/WebUIClient.h +++ b/Source/WebKit2/UIProcess/WebUIClient.h @@ -61,7 +61,7 @@ public: void setStatusText(WebPageProxy*, const String&); void mouseDidMoveOverElement(WebPageProxy*, WebEvent::Modifiers, APIObject*); - void missingPluginButtonClicked(WebPageProxy*, const String& mimeType, const String& url); + void missingPluginButtonClicked(WebPageProxy*, const String& mimeType, const String& url, const String& pluginsPageURL); void didNotHandleKeyEvent(WebPageProxy*, const NativeWebKeyboardEvent&); bool toolbarsAreVisible(WebPageProxy*); @@ -76,7 +76,7 @@ public: void setWindowFrame(WebPageProxy*, const WebCore::FloatRect&); WebCore::FloatRect windowFrame(WebPageProxy*); - bool canRunBeforeUnloadConfirmPanel(); + bool canRunBeforeUnloadConfirmPanel() const; bool runBeforeUnloadConfirmPanel(WebPageProxy*, const String&, WebFrameProxy*); void didDraw(WebPageProxy*); |