Chromium Code Reviews| Index: Source/modules/battery/BatteryManager.h |
| diff --git a/Source/modules/battery/BatteryManager.h b/Source/modules/battery/BatteryManager.h |
| index 66d25f4f1d7cf0bd29ae765b4f59b720291b8251..30a92bc68afcdc62b96951758adfae5379f82e7e 100644 |
| --- a/Source/modules/battery/BatteryManager.h |
| +++ b/Source/modules/battery/BatteryManager.h |
| @@ -6,7 +6,8 @@ |
| #define BatteryManager_h |
| #include "bindings/core/v8/ScriptPromise.h" |
| -#include "bindings/core/v8/ScriptPromiseResolver.h" |
| +#include "bindings/core/v8/ScriptPromiseProperty.h" |
| +#include "core/dom/ActiveDOMObject.h" |
| #include "core/dom/ContextLifecycleObserver.h" |
| #include "core/frame/PlatformEventController.h" |
| #include "modules/EventTargetModules.h" |
| @@ -56,17 +57,12 @@ public: |
| DECLARE_VIRTUAL_TRACE(); |
| private: |
| - enum State { |
| - NotStarted, |
| - Pending, |
| - Resolved, |
| - }; |
| - |
| explicit BatteryManager(ExecutionContext*); |
| - RefPtrWillBeMember<ScriptPromiseResolver> m_resolver; |
| + typedef ScriptPromiseProperty<Member<BatteryManager>, Member<BatteryManager>, RefPtrWillBeMember<DOMException>> BatteryProperty; |
|
mlamouri (slow - plz ping)
2015/03/07 14:54:42
nit: you can use C++11 form which I think is more
timvolodine
2015/03/12 13:53:11
Done.
|
| + Member<BatteryProperty> m_batteryProperty; |
| Member<BatteryStatus> m_batteryStatus; |
| - State m_state; |
| + bool m_isResolved; |
| }; |
| } // namespace blink |