diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-13 16:52:51 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-15 11:14:28 +0200 |
commit | bf4064cda667ca64b323223d3adada43f5c8413e (patch) | |
tree | d2c6af22dfb1bf64b91db8e4e1b2e99463064adb /src/core/web_contents_adapter_p.h | |
parent | 423b399a3336ed5832ac12fe0bb9c4c3eebc1c82 (diff) |
Handle new window/tab modifiers also on normal navigations
AddNewContents is only called when window.open is called from JavaScript.
We also want the shift/ctrl modifiers to trigger normal links to open
in the requested disposition. In this case OpenURLFromTab will pass
the detected disposition and we must create a new WebContents
ourselves.
Use the same code path going through
WebContentsAdapterClient::adoptNewWindow except that we pass a null
WebContents pointer to the WebContentsAdapter constructor and let it
create its own when initialized.
Change-Id: I817b0e72aec12723bf92d9b7ad85c1cecbf5e408
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/web_contents_adapter_p.h')
-rw-r--r-- | src/core/web_contents_adapter_p.h | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/src/core/web_contents_adapter_p.h b/src/core/web_contents_adapter_p.h new file mode 100644 index 000000000..143a76a44 --- /dev/null +++ b/src/core/web_contents_adapter_p.h @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtWebEngine module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef WEB_CONTENTS_ADAPTER_P_H +#define WEB_CONTENTS_ADAPTER_P_H + +#include "web_contents_adapter.h" + +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" + +class QtRenderViewObserverHost; +class WebContentsAdapterClient; +class WebContentsDelegateQt; +class WebEngineContext; + +class WebContentsAdapterPrivate { +public: + WebContentsAdapterPrivate(); + ~WebContentsAdapterPrivate(); + scoped_refptr<WebEngineContext> engineContext; + scoped_ptr<content::WebContents> webContents; + scoped_ptr<WebContentsDelegateQt> webContentsDelegate; + scoped_ptr<QtRenderViewObserverHost> renderViewObserverHost; + WebContentsAdapterClient *adapterClient; + quint64 nextRequestId; + int lastFindRequestId; +}; + +#endif // WEB_CONTENTS_ADAPTER_P_H |