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

Side by Side Diff: third_party/WebKit/Source/modules/battery/NavigatorBattery.cpp

Issue 2816543002: Move ScriptState::GetExecutionContext (Part 5) (Closed)
Patch Set: Rebase Created 3 years, 8 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 #include "modules/battery/NavigatorBattery.h" 5 #include "modules/battery/NavigatorBattery.h"
6 6
7 #include "core/dom/ExecutionContext.h"
7 #include "core/frame/LocalFrame.h" 8 #include "core/frame/LocalFrame.h"
8 #include "modules/battery/BatteryManager.h" 9 #include "modules/battery/BatteryManager.h"
9 10
10 namespace blink { 11 namespace blink {
11 12
12 NavigatorBattery::NavigatorBattery(Navigator& navigator) 13 NavigatorBattery::NavigatorBattery(Navigator& navigator)
13 : Supplement<Navigator>(navigator) {} 14 : Supplement<Navigator>(navigator) {}
14 15
15 ScriptPromise NavigatorBattery::getBattery(ScriptState* script_state, 16 ScriptPromise NavigatorBattery::getBattery(ScriptState* script_state,
16 Navigator& navigator) { 17 Navigator& navigator) {
17 return NavigatorBattery::From(navigator).getBattery(script_state); 18 return NavigatorBattery::From(navigator).getBattery(script_state);
18 } 19 }
19 20
20 ScriptPromise NavigatorBattery::getBattery(ScriptState* script_state) { 21 ScriptPromise NavigatorBattery::getBattery(ScriptState* script_state) {
21 if (!battery_manager_) 22 if (!battery_manager_) {
22 battery_manager_ = 23 battery_manager_ =
23 BatteryManager::Create(script_state->GetExecutionContext()); 24 BatteryManager::Create(ExecutionContext::From(script_state));
24 25 }
25 return battery_manager_->StartRequest(script_state); 26 return battery_manager_->StartRequest(script_state);
26 } 27 }
27 28
28 const char* NavigatorBattery::SupplementName() { 29 const char* NavigatorBattery::SupplementName() {
29 return "NavigatorBattery"; 30 return "NavigatorBattery";
30 } 31 }
31 32
32 NavigatorBattery& NavigatorBattery::From(Navigator& navigator) { 33 NavigatorBattery& NavigatorBattery::From(Navigator& navigator) {
33 NavigatorBattery* supplement = static_cast<NavigatorBattery*>( 34 NavigatorBattery* supplement = static_cast<NavigatorBattery*>(
34 Supplement<Navigator>::From(navigator, SupplementName())); 35 Supplement<Navigator>::From(navigator, SupplementName()));
35 if (!supplement) { 36 if (!supplement) {
36 supplement = new NavigatorBattery(navigator); 37 supplement = new NavigatorBattery(navigator);
37 ProvideTo(navigator, SupplementName(), supplement); 38 ProvideTo(navigator, SupplementName(), supplement);
38 } 39 }
39 return *supplement; 40 return *supplement;
40 } 41 }
41 42
42 DEFINE_TRACE(NavigatorBattery) { 43 DEFINE_TRACE(NavigatorBattery) {
43 visitor->Trace(battery_manager_); 44 visitor->Trace(battery_manager_);
44 Supplement<Navigator>::Trace(visitor); 45 Supplement<Navigator>::Trace(visitor);
45 } 46 }
46 47
47 } // namespace blink 48 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698