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

Unified Diff: content/renderer/renderer_blink_platform_impl.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, 10 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
Index: content/renderer/renderer_blink_platform_impl.h
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
index c054ee4758cf4ad3c79bd7720780f29409a573c6..dc6a81cf9f12bd26a22a362c3a70e8f60981c9af 100644
--- a/content/renderer/renderer_blink_platform_impl.h
+++ b/content/renderer/renderer_blink_platform_impl.h
@@ -32,6 +32,7 @@
}
namespace blink {
+class WebBatteryStatus;
class WebCanvasCaptureHandler;
class WebDeviceMotionData;
class WebDeviceOrientationData;
@@ -49,6 +50,7 @@
}
namespace content {
+class BatteryStatusDispatcher;
class DeviceLightEventPump;
class DeviceMotionEventPump;
class DeviceOrientationEventPump;
@@ -176,8 +178,6 @@
blink::WebString convertIDNToUnicode(
const blink::WebString& host,
const blink::WebString& languages) override;
- void connectToRemoteService(const char* name,
- mojo::ScopedMessagePipeHandle handle) override;
void startListening(blink::WebPlatformEventType,
blink::WebPlatformEventListener*) override;
void stopListening(blink::WebPlatformEventType) override;
@@ -220,6 +220,10 @@
static void SetMockDeviceOrientationDataForTesting(
const blink::WebDeviceOrientationData& data);
+ // Notifies blink::WebBatteryStatusListener that battery status has changed.
+ void MockBatteryStatusChangedForTesting(
+ const blink::WebBatteryStatus& status);
+
WebDatabaseObserverImpl* web_database_observer_impl() {
return web_database_observer_impl_.get();
}
@@ -286,6 +290,8 @@
scoped_ptr<blink::WebScrollbarBehavior> web_scrollbar_behavior_;
+ scoped_ptr<BatteryStatusDispatcher> battery_status_dispatcher_;
+
// Handle to the Vibration mojo service.
device::VibrationManagerPtr vibration_manager_;

Powered by Google App Engine
This is Rietveld 408576698