components/test_runner/test_runner.cc - Issue 1538803002: Migrates battery_status from content/renderer/ to WebKit/platform/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/test_runner/test_runner.cc

Issue 1538803002: 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, 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/html_viewer/web_test_delegate_impl.cc ('k') | components/test_runner/web_test_delegate.h » ('j') | third_party/WebKit/Source/platform/base/Bind.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/test_runner/test_runner.cc

diff --git a/components/test_runner/test_runner.cc b/components/test_runner/test_runner.cc

index e4e5877397c06b2262916aa931f2e8f57bcd46aa..aeb03c4a6054aa7ec35736ce2f384384b223d4f3 100644

--- a/components/test_runner/test_runner.cc

+++ b/components/test_runner/test_runner.cc

@@ -26,7 +26,6 @@

#include "gin/handle.h"

#include "gin/object_template_builder.h"

#include "gin/wrappable.h"

-#include "third_party/WebKit/public/platform/WebBatteryStatus.h"

#include "third_party/WebKit/public/platform/WebCanvas.h"

#include "third_party/WebKit/public/platform/WebData.h"

#include "third_party/WebKit/public/platform/WebPasswordCredential.h"

@@ -2531,17 +2530,12 @@ void TestRunner::DidChangeBatteryStatus(bool charging,

double chargingTime,

double dischargingTime,

double level) {

- blink::WebBatteryStatus status;

- status.charging = charging;

- status.chargingTime = chargingTime;

- status.dischargingTime = dischargingTime;

- status.level = level;

- delegate_->DidChangeBatteryStatus(status);

+ web_view_->updateBatteryStatusForTesting(

+ charging, chargingTime, dischargingTime, level);

}

void TestRunner::ResetBatteryStatus() {

- blink::WebBatteryStatus status;

- delegate_->DidChangeBatteryStatus(status);

+ web_view_->resetBatteryStatusForTesting();

}

void TestRunner::DidAcquirePointerLock() {