| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef BatteryClientImpl_h | 31 #ifndef BatteryClientImpl_h |
| 32 #define BatteryClientImpl_h | 32 #define BatteryClientImpl_h |
| 33 | 33 |
| 34 #if ENABLE(BATTERY_STATUS) | 34 #if ENABLE(BATTERY_STATUS) |
| 35 | 35 |
| 36 #include "BatteryClient.h" | |
| 37 #include "WebBatteryStatus.h" | 36 #include "WebBatteryStatus.h" |
| 37 #include "modules/battery/BatteryClient.h" |
| 38 | 38 |
| 39 namespace WebCore { class BatteryController; } | 39 namespace WebCore { class BatteryController; } |
| 40 | 40 |
| 41 namespace WebKit { | 41 namespace WebKit { |
| 42 | 42 |
| 43 class WebBatteryStatusClient; | 43 class WebBatteryStatusClient; |
| 44 | 44 |
| 45 class BatteryClientImpl : public WebCore::BatteryClient { | 45 class BatteryClientImpl : public WebCore::BatteryClient { |
| 46 public: | 46 public: |
| 47 explicit BatteryClientImpl(WebBatteryStatusClient*); | 47 explicit BatteryClientImpl(WebBatteryStatusClient*); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 58 private: | 58 private: |
| 59 WebBatteryStatusClient* m_client; | 59 WebBatteryStatusClient* m_client; |
| 60 WebCore::BatteryController* m_controller; | 60 WebCore::BatteryController* m_controller; |
| 61 }; | 61 }; |
| 62 | 62 |
| 63 } // namespce WebKit | 63 } // namespce WebKit |
| 64 | 64 |
| 65 #endif // ENABLE(BATTERY_STATUS) | 65 #endif // ENABLE(BATTERY_STATUS) |
| 66 | 66 |
| 67 #endif // BatteryClientImpl_h | 67 #endif // BatteryClientImpl_h |
| OLD | NEW |