| Index: Source/WebKit/chromium/src/WebViewImpl.cpp
|
| diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
|
| index 21b57b28e58e071b3246a2094e2efc8d54597107..0ea8bd24237d2d0ff107a0a35c43475dd137b0d7 100644
|
| --- a/Source/WebKit/chromium/src/WebViewImpl.cpp
|
| +++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
|
| @@ -48,7 +48,6 @@
|
| #include <wtf/TemporaryChange.h>
|
| #include <wtf/Uint8ClampedArray.h>
|
| #include "AutofillPopupMenuClient.h"
|
| -#include "BatteryClientImpl.h"
|
| #include "CSSValueKeywords.h"
|
| #include "CompositionUnderlineVectorBuilder.h"
|
| #include "ContextFeaturesClientImpl.h"
|
| @@ -152,7 +151,6 @@
|
| #include "core/rendering/RenderView.h"
|
| #include "core/rendering/RenderWidget.h"
|
| #include "core/rendering/TextAutosizer.h"
|
| -#include "modules/battery/BatteryController.h"
|
| #include "modules/geolocation/GeolocationController.h"
|
| #include "weborigin/SchemeRegistry.h"
|
| #include "weborigin/SecurityOrigin.h"
|
| @@ -420,9 +418,6 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
|
| , m_speechRecognitionClient(SpeechRecognitionClientProxy::create(client ? client->speechRecognizer() : 0))
|
| , m_deviceOrientationClientProxy(adoptPtr(new DeviceOrientationClientProxy(client ? client->deviceOrientationClient() : 0)))
|
| , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? client->geolocationClient() : 0)))
|
| -#if ENABLE(BATTERY_STATUS)
|
| - , m_batteryClient(adoptPtr(new BatteryClientImpl(client ? client->batteryStatusClient() : 0)))
|
| -#endif
|
| , m_emulatedTextZoomFactor(1)
|
| , m_userMediaClientImpl(this)
|
| #if ENABLE(NAVIGATOR_CONTENT_UTILS)
|
| @@ -461,11 +456,6 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
|
| provideGeolocationTo(m_page.get(), m_geolocationClientProxy.get());
|
| m_geolocationClientProxy->setController(GeolocationController::from(m_page.get()));
|
|
|
| -#if ENABLE(BATTERY_STATUS)
|
| - provideBatteryTo(m_page.get(), m_batteryClient.get());
|
| - m_batteryClient->setController(BatteryController::from(m_page.get()));
|
| -#endif
|
| -
|
| m_page->setGroupType(Page::SharedPageGroup);
|
|
|
| unsigned layoutMilestones = DidFirstLayout | DidFirstVisuallyNonEmptyLayout;
|
| @@ -1716,13 +1706,6 @@ void WebViewImpl::didExitFullScreen()
|
| m_fullScreenFrame.clear();
|
| }
|
|
|
| -#if ENABLE(BATTERY_STATUS)
|
| -void WebViewImpl::updateBatteryStatus(const WebBatteryStatus& status)
|
| -{
|
| - m_batteryClient->updateBatteryStatus(status);
|
| -}
|
| -#endif
|
| -
|
| void WebViewImpl::animate(double monotonicFrameBeginTime)
|
| {
|
| TRACE_EVENT0("webkit", "WebViewImpl::animate");
|
|
|