diff --git a/atom/browser/osr/osr_web_contents_view.cc b/atom/browser/osr/osr_web_contents_view.cc index 59200d15855d..0d9c52743bc1 100644 --- a/atom/browser/osr/osr_web_contents_view.cc +++ b/atom/browser/osr/osr_web_contents_view.cc @@ -109,15 +109,15 @@ void OffScreenWebContentsView::SetOverscrollControllerEnabled(bool enabled) { } void OffScreenWebContentsView::GetScreenInfo( - blink::WebScreenInfo* web_screen_info) const { - web_screen_info->rect = gfx::Rect(view_->size()); - web_screen_info->availableRect = gfx::Rect(view_->size()); - web_screen_info->depth = 24; - web_screen_info->depthPerComponent = 8; - web_screen_info->deviceScaleFactor = view_->scale_factor(); - web_screen_info->orientationAngle = 0; - web_screen_info->orientationType = - blink::WebScreenOrientationLandscapePrimary; + content::ScreenInfo* screen_info) const { + screen_info->rect = gfx::Rect(view_->size()); + screen_info->available_rect = gfx::Rect(view_->size()); + screen_info->depth = 24; + screen_info->depth_per_component = 8; + screen_info->device_scale_factor = view_->scale_factor(); + screen_info->orientation_angle = 0; + screen_info->orientation_type = + content::SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY; } #if defined(OS_MACOSX) @@ -141,9 +141,10 @@ void OffScreenWebContentsView::StartDragging( blink::WebDragOperationsMask allowed_ops, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset, - const content::DragEventSourceInfo& event_info) { + const content::DragEventSourceInfo& event_info, + content::RenderWidgetHostImpl* source_rwh) { if (web_contents_) - web_contents_->SystemDragEnded(); + web_contents_->SystemDragEnded(source_rwh); } void OffScreenWebContentsView::UpdateDragCursor( diff --git a/atom/browser/osr/osr_web_contents_view.h b/atom/browser/osr/osr_web_contents_view.h index 08e1d731e354..8e4e24299473 100644 --- a/atom/browser/osr/osr_web_contents_view.h +++ b/atom/browser/osr/osr_web_contents_view.h @@ -51,7 +51,7 @@ class OffScreenWebContentsView : public content::WebContentsView, void RenderViewCreated(content::RenderViewHost* host) override; void RenderViewSwappedIn(content::RenderViewHost* host) override; void SetOverscrollControllerEnabled(bool enabled) override; - void GetScreenInfo(blink::WebScreenInfo* web_screen_info) const override; + void GetScreenInfo(content::ScreenInfo* screen_info) const override; #if defined(OS_MACOSX) void SetAllowOtherViews(bool allow) override; @@ -61,12 +61,12 @@ class OffScreenWebContentsView : public content::WebContentsView, #endif // content::RenderViewHostDelegateView - void StartDragging( - const content::DropData& drop_data, - blink::WebDragOperationsMask allowed_ops, - const gfx::ImageSkia& image, - const gfx::Vector2d& image_offset, - const content::DragEventSourceInfo& event_info) override; + void StartDragging(const content::DropData& drop_data, + blink::WebDragOperationsMask allowed_ops, + const gfx::ImageSkia& image, + const gfx::Vector2d& image_offset, + const content::DragEventSourceInfo& event_info, + content::RenderWidgetHostImpl* source_rwh) override; void UpdateDragCursor(blink::WebDragOperation operation) override; private: