summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2016-04-19 12:15:53 +0200
committerKai Koehne <kai.koehne@qt.io>2016-04-20 07:15:47 +0000
commit643aa579fc94933eefa8eb20af6729e2140cf480 (patch)
treeede74887fe1765d9acb2e3488c22cf972e29dba4
parent097f0e78e8a26ea1cda8b7d2e14fcf5551a72abd (diff)
Remove unused BrowserContextAdapter handles
Change-Id: Ic3504db1b55e1ff4375efacb450a96ce32a119ee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-rw-r--r--src/core/browser_context_qt.cpp4
-rw-r--r--src/core/permission_manager_qt.cpp5
-rw-r--r--src/core/permission_manager_qt.h3
-rw-r--r--src/core/ssl_host_state_delegate_qt.cpp3
-rw-r--r--src/core/ssl_host_state_delegate_qt.h3
5 files changed, 7 insertions, 11 deletions
diff --git a/src/core/browser_context_qt.cpp b/src/core/browser_context_qt.cpp
index 740f38237..a59c0b196 100644
--- a/src/core/browser_context_qt.cpp
+++ b/src/core/browser_context_qt.cpp
@@ -134,7 +134,7 @@ content::PushMessagingService *BrowserContextQt::GetPushMessagingService()
content::SSLHostStateDelegate* BrowserContextQt::GetSSLHostStateDelegate()
{
if (!sslHostStateDelegate)
- sslHostStateDelegate.reset(new SSLHostStateDelegateQt(m_adapter));
+ sslHostStateDelegate.reset(new SSLHostStateDelegateQt());
return sslHostStateDelegate.get();
}
@@ -146,7 +146,7 @@ scoped_ptr<content::ZoomLevelDelegate> BrowserContextQt::CreateZoomLevelDelegate
content::PermissionManager *BrowserContextQt::GetPermissionManager()
{
if (!permissionManager)
- permissionManager.reset(new PermissionManagerQt(m_adapter));
+ permissionManager.reset(new PermissionManagerQt());
return permissionManager.get();
}
diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp
index a4b763464..f68cd9699 100644
--- a/src/core/permission_manager_qt.cpp
+++ b/src/core/permission_manager_qt.cpp
@@ -62,9 +62,8 @@ BrowserContextAdapter::PermissionType toQt(content::PermissionType type)
return BrowserContextAdapter::UnsupportedPermission;
}
-PermissionManagerQt::PermissionManagerQt(BrowserContextAdapter *contextAdapter)
- : m_contextAdapter(contextAdapter)
- , m_subscriberCount(0)
+PermissionManagerQt::PermissionManagerQt()
+ : m_subscriberCount(0)
{
}
diff --git a/src/core/permission_manager_qt.h b/src/core/permission_manager_qt.h
index 8d03f275e..d4f4262a9 100644
--- a/src/core/permission_manager_qt.h
+++ b/src/core/permission_manager_qt.h
@@ -49,7 +49,7 @@ namespace QtWebEngineCore {
class PermissionManagerQt : public content::PermissionManager {
public:
- PermissionManagerQt(BrowserContextAdapter *);
+ PermissionManagerQt();
~PermissionManagerQt();
typedef BrowserContextAdapter::PermissionType PermissionType;
@@ -95,7 +95,6 @@ public:
void UnsubscribePermissionStatusChange(int subscription_id) override;
private:
- BrowserContextAdapter *m_contextAdapter;
QHash<QPair<QUrl, PermissionType>, bool> m_permissions;
struct Request {
int id;
diff --git a/src/core/ssl_host_state_delegate_qt.cpp b/src/core/ssl_host_state_delegate_qt.cpp
index cf17b944c..506172aaa 100644
--- a/src/core/ssl_host_state_delegate_qt.cpp
+++ b/src/core/ssl_host_state_delegate_qt.cpp
@@ -72,8 +72,7 @@ void CertPolicy::Allow(const net::X509Certificate& cert, net::CertStatus error)
m_allowed[fingerprint] |= error;
}
-SSLHostStateDelegateQt::SSLHostStateDelegateQt(BrowserContextAdapter *contextAdapter)
- : m_contextAdapter(contextAdapter)
+SSLHostStateDelegateQt::SSLHostStateDelegateQt()
{
}
diff --git a/src/core/ssl_host_state_delegate_qt.h b/src/core/ssl_host_state_delegate_qt.h
index 7c91fcb2d..64a430094 100644
--- a/src/core/ssl_host_state_delegate_qt.h
+++ b/src/core/ssl_host_state_delegate_qt.h
@@ -57,7 +57,7 @@ private:
class SSLHostStateDelegateQt : public content::SSLHostStateDelegate {
public:
- SSLHostStateDelegateQt(BrowserContextAdapter *);
+ SSLHostStateDelegateQt();
~SSLHostStateDelegateQt();
// content::SSLHostStateDelegate implementation:
@@ -71,7 +71,6 @@ public:
virtual bool HasAllowException(const std::string &host) const override;
private:
- BrowserContextAdapter *m_contextAdapter;
std::map<std::string, CertPolicy> m_certPolicyforHost;
};