ui/views/widget/desktop_aura/desktop_native_widget_aura.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_native_widget_aura.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_native_cursor_manager.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e1b03bf712757295903be7e180e79d96b45327cd..6dc7c5f4b413d2c16b92475793aebd8ad8d2f158 100644

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

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

@@ -19,12 +19,11 @@

#include "ui/base/hit_test.h"

#include "ui/base/ime/input_method.h"

#include "ui/compositor/layer.h"

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

#include "ui/gfx/canvas.h"

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

#include "ui/gfx/geometry/point_conversions.h"

#include "ui/gfx/geometry/rect.h"

#include "ui/gfx/geometry/size_conversions.h"

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

#include "ui/native_theme/native_theme.h"

#include "ui/views/corewm/tooltip.h"

#include "ui/views/corewm/tooltip_controller.h"

@@ -680,7 +679,7 @@ void DesktopNativeWidgetAura::SetBounds(const gfx::Rect& bounds) {

if (!content_window_)

return;

aura::Window* root = host_->window();

- gfx::Screen* screen = gfx::Screen::GetScreen();

+ display::Screen* screen = display::Screen::GetScreen();

gfx::Rect bounds_in_pixels = screen->DIPToScreenRectInWindow(root, bounds);

desktop_window_tree_host_->AsWindowTreeHost()->SetBounds(bounds_in_pixels);

}