| Index: content/browser/renderer_host/render_widget_host.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc
|
| index 564543de221c88ea5d03a7e31b57bd2bb71c9e47..e782864a29e08499818d49bea7b420993cf40d5e 100644
|
| --- a/content/browser/renderer_host/render_widget_host.cc
|
| +++ b/content/browser/renderer_host/render_widget_host.cc
|
| @@ -40,6 +40,7 @@
|
| using base::Time;
|
| using base::TimeDelta;
|
| using base::TimeTicks;
|
| +using content::RenderWidgetHostViewPort;
|
| using content::UserMetricsAction;
|
| using WebKit::WebGestureEvent;
|
| using WebKit::WebInputEvent;
|
| @@ -152,7 +153,7 @@ RenderWidgetHost::~RenderWidgetHost() {
|
| }
|
|
|
| void RenderWidgetHost::SetView(RenderWidgetHostView* view) {
|
| - view_ = RenderWidgetHostViewBase::FromRWHV(view);
|
| + view_ = RenderWidgetHostViewPort::FromRWHV(view);
|
|
|
| if (!view_) {
|
| GpuSurfaceTracker::Get()->SetSurfaceHandle(
|
| @@ -851,7 +852,7 @@ void RenderWidgetHost::RejectMouseLockOrUnlockIfNecessary() {
|
| }
|
|
|
| bool RenderWidgetHost::IsMouseLocked() const {
|
| - return view_ ? view_->mouse_locked() : false;
|
| + return view_ ? view_->IsMouseLocked() : false;
|
| }
|
|
|
| bool RenderWidgetHost::IsFullscreen() const {
|
| @@ -1267,7 +1268,7 @@ void RenderWidgetHost::OnMsgGetScreenInfo(gfx::NativeViewId window_id,
|
| if (view_)
|
| view_->GetScreenInfo(results);
|
| else
|
| - RenderWidgetHostViewBase::GetDefaultScreenInfo(results);
|
| + RenderWidgetHostViewPort::GetDefaultScreenInfo(results);
|
| }
|
|
|
| void RenderWidgetHost::OnMsgGetWindowRect(gfx::NativeViewId window_id,
|
|
|