Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(981)

Side by Side Diff: third_party/WebKit/Source/modules/battery/BatteryManager.h

Issue 1740843002: Revert of Migrates battery_status from content/renderer/ to WebKit/platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef BatteryManager_h 5 #ifndef BatteryManager_h
6 #define BatteryManager_h 6 #define BatteryManager_h
7 7
8 #include "bindings/core/v8/ScriptPromise.h" 8 #include "bindings/core/v8/ScriptPromise.h"
9 #include "bindings/core/v8/ScriptPromiseProperty.h" 9 #include "bindings/core/v8/ScriptPromiseProperty.h"
10 #include "core/dom/ActiveDOMObject.h" 10 #include "core/dom/ActiveDOMObject.h"
11 #include "core/dom/ContextLifecycleObserver.h" 11 #include "core/dom/ContextLifecycleObserver.h"
12 #include "core/frame/PlatformEventController.h" 12 #include "core/frame/PlatformEventController.h"
13 #include "modules/EventTargetModules.h" 13 #include "modules/EventTargetModules.h"
14 #include "platform/battery/battery_status.h"
15 #include "platform/heap/Handle.h" 14 #include "platform/heap/Handle.h"
16 15
17 namespace blink { 16 namespace blink {
18 17
18 class BatteryStatus;
19
19 class BatteryManager final : public RefCountedGarbageCollectedEventTargetWithInl ineData<BatteryManager>, public ActiveDOMObject, public PlatformEventController { 20 class BatteryManager final : public RefCountedGarbageCollectedEventTargetWithInl ineData<BatteryManager>, public ActiveDOMObject, public PlatformEventController {
20 REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(BatteryManager); 21 REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(BatteryManager);
21 DEFINE_WRAPPERTYPEINFO(); 22 DEFINE_WRAPPERTYPEINFO();
22 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(BatteryManager); 23 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(BatteryManager);
23 public: 24 public:
24 static BatteryManager* create(ExecutionContext*); 25 static BatteryManager* create(ExecutionContext*);
25 ~BatteryManager() override; 26 ~BatteryManager() override;
26 27
27 // Returns a promise object that will be resolved with this BatteryManager. 28 // Returns a promise object that will be resolved with this BatteryManager.
28 ScriptPromise startRequest(ScriptState*); 29 ScriptPromise startRequest(ScriptState*);
(...skipping 24 matching lines...) Expand all
53 void stop() override; 54 void stop() override;
54 bool hasPendingActivity() const override; 55 bool hasPendingActivity() const override;
55 56
56 DECLARE_VIRTUAL_TRACE(); 57 DECLARE_VIRTUAL_TRACE();
57 58
58 private: 59 private:
59 explicit BatteryManager(ExecutionContext*); 60 explicit BatteryManager(ExecutionContext*);
60 61
61 using BatteryProperty = ScriptPromiseProperty<Member<BatteryManager>, Member <BatteryManager>, Member<DOMException>>; 62 using BatteryProperty = ScriptPromiseProperty<Member<BatteryManager>, Member <BatteryManager>, Member<DOMException>>;
62 Member<BatteryProperty> m_batteryProperty; 63 Member<BatteryProperty> m_batteryProperty;
63 BatteryStatus m_batteryStatus; 64 Member<BatteryStatus> m_batteryStatus;
64 }; 65 };
65 66
66 } // namespace blink 67 } // namespace blink
67 68
68 #endif // BatteryManager_h 69 #endif // BatteryManager_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698