From d6a599dbc9d824a462b2b206316e102bf8136446 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 11 Jul 2012 13:45:28 +0200 Subject: Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 (http://svn.webkit.org/repository/webkit/trunk@122325) New snapshot that should work with the latest Qt build system changes --- Source/WebKit2/WebProcess/WebProcess.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'Source/WebKit2/WebProcess/WebProcess.h') diff --git a/Source/WebKit2/WebProcess/WebProcess.h b/Source/WebKit2/WebProcess/WebProcess.h index 986ce36a5..090d4d82d 100644 --- a/Source/WebKit2/WebProcess/WebProcess.h +++ b/Source/WebKit2/WebProcess/WebProcess.h @@ -57,6 +57,14 @@ class QNetworkAccessManager; #include #endif +#if ENABLE(BATTERY_STATUS) +#include "WebBatteryManager.h" +#endif + +#if ENABLE(NETWORK_INFO) +#include "WebNetworkInfoManager.h" +#endif + #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) #include "WebNotificationManager.h" #endif @@ -142,6 +150,14 @@ public: // Geolocation WebGeolocationManager& geolocationManager() { return m_geolocationManager; } + +#if ENABLE(BATTERY_STATUS) + WebBatteryManager& batteryManager() { return m_batteryManager; } +#endif + +#if ENABLE(NETWORK_INFO) + WebNetworkInfoManager& networkInfoManager() { return m_networkInfoManager; } +#endif #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) WebNotificationManager& notificationManager() { return m_notificationManager; } @@ -286,6 +302,12 @@ private: TextCheckerState m_textCheckerState; WebGeolocationManager m_geolocationManager; +#if ENABLE(BATTERY_STATUS) + WebBatteryManager m_batteryManager; +#endif +#if ENABLE(NETWORK_INFO) + WebNetworkInfoManager m_networkInfoManager; +#endif #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) WebNotificationManager m_notificationManager; #endif -- cgit v1.2.1