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

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

Issue 2629593004: Disambiguate LifecycleObserver::contextDestroyed (Closed)
Patch Set: temp Created 3 years, 11 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/ActiveScriptWrappable.h" 8 #include "bindings/core/v8/ActiveScriptWrappable.h"
9 #include "bindings/core/v8/ScriptPromise.h" 9 #include "bindings/core/v8/ScriptPromise.h"
10 #include "bindings/core/v8/ScriptPromiseProperty.h" 10 #include "bindings/core/v8/ScriptPromiseProperty.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 // Inherited from PlatformEventController. 52 // Inherited from PlatformEventController.
53 void didUpdateData() override; 53 void didUpdateData() override;
54 void registerWithDispatcher() override; 54 void registerWithDispatcher() override;
55 void unregisterWithDispatcher() override; 55 void unregisterWithDispatcher() override;
56 bool hasLastData() override; 56 bool hasLastData() override;
57 57
58 // SuspendableObject implementation. 58 // SuspendableObject implementation.
59 void suspend() override; 59 void suspend() override;
60 void resume() override; 60 void resume() override;
61 void contextDestroyed() override; 61 void contextDestroyed(ExecutionContext*) override;
62 void contextDestroyed(Page*) override;
62 63
63 // ScriptWrappable implementation. 64 // ScriptWrappable implementation.
64 bool hasPendingActivity() const final; 65 bool hasPendingActivity() const final;
65 66
66 DECLARE_VIRTUAL_TRACE(); 67 DECLARE_VIRTUAL_TRACE();
67 68
68 private: 69 private:
69 explicit BatteryManager(ExecutionContext*); 70 explicit BatteryManager(ExecutionContext*);
70 71
71 using BatteryProperty = ScriptPromiseProperty<Member<BatteryManager>, 72 using BatteryProperty = ScriptPromiseProperty<Member<BatteryManager>,
72 Member<BatteryManager>, 73 Member<BatteryManager>,
73 Member<DOMException>>; 74 Member<DOMException>>;
74 Member<BatteryProperty> m_batteryProperty; 75 Member<BatteryProperty> m_batteryProperty;
75 BatteryStatus m_batteryStatus; 76 BatteryStatus m_batteryStatus;
76 }; 77 };
77 78
78 } // namespace blink 79 } // namespace blink
79 80
80 #endif // BatteryManager_h 81 #endif // BatteryManager_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698