diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebKit/chromium/src/ChromeClientImpl.h | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
| download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz | |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/WebKit/chromium/src/ChromeClientImpl.h')
| -rw-r--r-- | Source/WebKit/chromium/src/ChromeClientImpl.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.h b/Source/WebKit/chromium/src/ChromeClientImpl.h index 23e02ff3d..c34945404 100644 --- a/Source/WebKit/chromium/src/ChromeClientImpl.h +++ b/Source/WebKit/chromium/src/ChromeClientImpl.h @@ -35,6 +35,7 @@ #include "ChromeClientChromium.h" #include "PopupMenu.h" #include "SearchPopupMenu.h" +#include "WebNavigationPolicy.h" namespace WebCore { class AccessibilityObject; @@ -189,6 +190,7 @@ public: // ChromeClientImpl: void setCursorForPlugin(const WebCursorInfo&); + void setNewWindowNavigationPolicy(WebNavigationPolicy); virtual bool selectItemWritingDirectionIsNatural(); virtual bool selectItemAlignmentFollowsMenuWritingDirection(); @@ -196,10 +198,6 @@ public: virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const; virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const; -#if ENABLE(CONTEXT_MENUS) - virtual void showContextMenu() { } -#endif - virtual bool shouldRunModalDialogDuringPageDismissal(const DialogType&, const String& dialogMessage, WebCore::FrameLoader::PageDismissalType) const; virtual bool shouldRubberBandInDirection(WebCore::ScrollDirection) const; @@ -213,6 +211,7 @@ public: #endif private: + WebNavigationPolicy getNavigationPolicy(); void getPopupMenuInfo(WebCore::PopupContainer*, WebPopupMenuInfo*); void setCursor(const WebCursorInfo&); @@ -222,6 +221,9 @@ private: bool m_scrollbarsVisible; bool m_menubarVisible; bool m_resizable; + + // The policy for how the next webview to be created will be shown. + WebNavigationPolicy m_nextNewWindowNavigationPolicy; }; } // namespace WebKit |