Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(773)

Unified Diff: ui/views/mus/screen_mus.cc

Issue 1945903002: Move display_finder to ui/display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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
« ui/display/display_finder.h ('K') | « ui/views/mus/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/screen_mus.cc
diff --git a/ui/views/mus/screen_mus.cc b/ui/views/mus/screen_mus.cc
index d251c3d717762067bb70a46142d5918f8bed31ce..b2a84a7ff77dd2a2ecc8e7693145f1f1340ff058 100644
--- a/ui/views/mus/screen_mus.cc
+++ b/ui/views/mus/screen_mus.cc
@@ -8,8 +8,8 @@
#include "services/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connector.h"
#include "ui/aura/window.h"
+#include "ui/display/display_finder.h"
#include "ui/display/display_observer.h"
-#include "ui/gfx/display_finder.h"
#include "ui/mojo/display/display_type_converters.h"
#include "ui/views/mus/screen_mus_delegate.h"
#include "ui/views/mus/window_manager_frame_values.h"
@@ -155,7 +155,7 @@ display::Display ScreenMus::GetDisplayNearestWindow(
display::Display ScreenMus::GetDisplayNearestPoint(
const gfx::Point& point) const {
- return *gfx::FindDisplayNearestPoint(displays_, point);
+ return *display::FindDisplayNearestPoint(displays_, point);
}
int ScreenMus::GetNumDisplays() const {
@@ -169,7 +169,7 @@ std::vector<display::Display> ScreenMus::GetAllDisplays() const {
display::Display ScreenMus::GetDisplayMatching(
const gfx::Rect& match_rect) const {
const display::Display* match =
- gfx::FindDisplayWithBiggestIntersection(displays_, match_rect);
+ display::FindDisplayWithBiggestIntersection(displays_, match_rect);
return match ? *match : GetPrimaryDisplay();
}
« ui/display/display_finder.h ('K') | « ui/views/mus/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698