| Index: third_party/WebKit/Source/web/LocalFrameClientImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp b/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp
|
| index 764f537317afaa6be941fc4ad30c19d32fad473e..3caa6575b7c437ac07994a27f0bd8f23efe9b874 100644
|
| --- a/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp
|
| @@ -39,6 +39,7 @@
|
| #include "core/events/MouseEvent.h"
|
| #include "core/events/UIEventWithKeyState.h"
|
| #include "core/exported/WebDataSourceImpl.h"
|
| +#include "core/exported/WebViewBase.h"
|
| #include "core/frame/FrameView.h"
|
| #include "core/frame/Settings.h"
|
| #include "core/html/HTMLFrameElementBase.h"
|
| @@ -106,7 +107,6 @@
|
| #include "web/WebDevToolsFrontendImpl.h"
|
| #include "web/WebLocalFrameImpl.h"
|
| #include "web/WebPluginContainerImpl.h"
|
| -#include "web/WebViewImpl.h"
|
|
|
| #include <memory>
|
|
|
| @@ -424,7 +424,7 @@ void LocalFrameClientImpl::DispatchDidChangeThemeColor() {
|
| }
|
|
|
| static bool AllowCreatingBackgroundTabs() {
|
| - const WebInputEvent* input_event = WebViewImpl::CurrentInputEvent();
|
| + const WebInputEvent* input_event = WebViewBase::CurrentInputEvent();
|
| if (!input_event || (input_event->GetType() != WebInputEvent::kMouseUp &&
|
| (input_event->GetType() != WebInputEvent::kRawKeyDown &&
|
| input_event->GetType() != WebInputEvent::kKeyDown) &&
|
| @@ -587,7 +587,7 @@ void LocalFrameClientImpl::LoadErrorPage(int reason) {
|
| }
|
|
|
| bool LocalFrameClientImpl::NavigateBackForward(int offset) const {
|
| - WebViewImpl* webview = web_frame_->ViewImpl();
|
| + WebViewBase* webview = web_frame_->ViewImpl();
|
| if (!webview->Client())
|
| return false;
|
|
|
| @@ -937,7 +937,7 @@ void LocalFrameClientImpl::DispatchDidChangeManifest() {
|
| }
|
|
|
| unsigned LocalFrameClientImpl::BackForwardLength() {
|
| - WebViewImpl* webview = web_frame_->ViewImpl();
|
| + WebViewBase* webview = web_frame_->ViewImpl();
|
| if (!webview || !webview->Client())
|
| return 0;
|
| return webview->Client()->HistoryBackListCount() + 1 +
|
|
|