| Index: content/browser/renderer_host/render_widget_host_view_base.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
|
| index 459afee737ba07b29164c66dac9291efde5d90f2..abe318f0fbebf084b1b2ecc7e78490a2ca454ca0 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_base.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_base.h
|
| @@ -58,15 +58,15 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
|
| virtual string16 GetSelectedText() const OVERRIDE;
|
| virtual bool IsMouseLocked() OVERRIDE;
|
| virtual void UnhandledWheelEvent(
|
| - const WebKit::WebMouseWheelEvent& event) OVERRIDE;
|
| + const blink::WebMouseWheelEvent& event) OVERRIDE;
|
| virtual InputEventAckState FilterInputEvent(
|
| - const WebKit::WebInputEvent& input_event) OVERRIDE;
|
| + const blink::WebInputEvent& input_event) OVERRIDE;
|
| virtual void OnSetNeedsFlushInput() OVERRIDE;
|
| virtual void OnDidFlushInput() OVERRIDE;
|
| virtual void GestureEventAck(int gesture_event_type,
|
| InputEventAckState ack_result) OVERRIDE;
|
| - virtual void SetPopupType(WebKit::WebPopupType popup_type) OVERRIDE;
|
| - virtual WebKit::WebPopupType GetPopupType() OVERRIDE;
|
| + virtual void SetPopupType(blink::WebPopupType popup_type) OVERRIDE;
|
| + virtual blink::WebPopupType GetPopupType() OVERRIDE;
|
| virtual BrowserAccessibilityManager*
|
| GetBrowserAccessibilityManager() const OVERRIDE;
|
| virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch,
|
| @@ -126,7 +126,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
|
|
|
| // Whether this view is a popup and what kind of popup it is (select,
|
| // autofill...).
|
| - WebKit::WebPopupType popup_type_;
|
| + blink::WebPopupType popup_type_;
|
|
|
| // A custom background to paint behind the web content. This will be tiled
|
| // horizontally. Can be null, in which case we fall back to painting white.
|
|
|