diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
| commit | d6a599dbc9d824a462b2b206316e102bf8136446 (patch) | |
| tree | ecb257a5e55b2239d74b90fdad62fccd661cf286 /Source/WebKit2/WebProcess/WebProcess.h | |
| parent | 3ccc3a85f09a83557b391aae380d3bf5f81a2911 (diff) | |
| download | qtwebkit-d6a599dbc9d824a462b2b206316e102bf8136446.tar.gz | |
Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 (http://svn.webkit.org/repository/webkit/trunk@122325)
New snapshot that should work with the latest Qt build system changes
Diffstat (limited to 'Source/WebKit2/WebProcess/WebProcess.h')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebProcess.h | 22 |
1 files changed, 22 insertions, 0 deletions
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 <dispatch/dispatch.h> #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 |
