| Index: content/browser/web_contents/web_contents_view_aura.h
|
| diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h
|
| index bccb677ec2e58646312e1e24e9a892c3ca2b2f44..665898551496b2d5a4677e7c973958dc526b4aee 100644
|
| --- a/content/browser/web_contents/web_contents_view_aura.h
|
| +++ b/content/browser/web_contents/web_contents_view_aura.h
|
| @@ -58,7 +58,7 @@ class CONTENT_EXPORT WebContentsViewAura
|
|
|
| void SizeChangedCommon(const gfx::Size& size);
|
|
|
| - void EndDrag(WebKit::WebDragOperationsMask ops);
|
| + void EndDrag(blink::WebDragOperationsMask ops);
|
|
|
| // Creates and sets up the overlay window that will be displayed during the
|
| // overscroll gesture.
|
| @@ -136,11 +136,11 @@ class CONTENT_EXPORT WebContentsViewAura
|
| bool right_aligned,
|
| bool allow_multiple_selection) OVERRIDE;
|
| virtual void StartDragging(const DropData& drop_data,
|
| - WebKit::WebDragOperationsMask operations,
|
| + blink::WebDragOperationsMask operations,
|
| const gfx::ImageSkia& image,
|
| const gfx::Vector2d& image_offset,
|
| const DragEventSourceInfo& event_info) OVERRIDE;
|
| - virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE;
|
| + virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE;
|
| virtual void GotFocus() OVERRIDE;
|
| virtual void TakeFocus(bool reverse) OVERRIDE;
|
|
|
| @@ -202,7 +202,7 @@ class CONTENT_EXPORT WebContentsViewAura
|
|
|
| scoped_ptr<WebContentsViewDelegate> delegate_;
|
|
|
| - WebKit::WebDragOperationsMask current_drag_op_;
|
| + blink::WebDragOperationsMask current_drag_op_;
|
|
|
| scoped_ptr<DropData> current_drop_data_;
|
|
|
|
|