ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc - Issue 1915363002: Rename gfx::Display/Screen to display::Display/Screen in views/wm

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc

Issue 1915363002: Rename gfx::Display/Screen to display::Display/Screen in views/wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more cleanups Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc ('k') | ui/views/widget/desktop_aura/desktop_factory_ozone.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc

diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc

index d39aaf2945a1878fb8ff683c42325e1d378b6089..c133595c1232d980619f041deca5d0dfb7f94a95 100644

--- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc

+++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc

@@ -25,11 +25,11 @@

#include "ui/base/x/selection_utils.h"

#include "ui/base/x/x11_foreign_window_manager.h"

#include "ui/base/x/x11_util.h"

+#include "ui/display/screen.h"

#include "ui/events/event.h"

#include "ui/events/event_utils.h"

#include "ui/events/platform/platform_event_source.h"

#include "ui/gfx/image/image_skia.h"

-#include "ui/gfx/screen.h"

#include "ui/views/controls/image_view.h"

#include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"

#include "ui/views/widget/desktop_aura/x11_topmost_window_finder.h"

@@ -1187,8 +1187,8 @@ void DesktopDragDropClientAuraX11::CreateDragWidget(

params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;

params.accept_events = false;

- gfx::Point location =

- gfx::Screen::GetScreen()->GetCursorScreenPoint() - drag_widget_offset_;

+ gfx::Point location = display::Screen::GetScreen()->GetCursorScreenPoint() -

+ drag_widget_offset_;

params.bounds = gfx::Rect(location, image.size());

widget->set_focus_on_creation(false);

widget->set_frame_type(Widget::FRAME_TYPE_FORCE_NATIVE);