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

Unified Diff: ash/desktop_background/desktop_background_view.cc

Issue 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build Created 4 years, 4 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
Index: ash/desktop_background/desktop_background_view.cc
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc
index be85e5e6c455a2eee9371ae8a9dff93a4aca2cc5..4682930bf6e6b847de88a781cf031d1f94ee4324 100644
--- a/ash/desktop_background/desktop_background_view.cc
+++ b/ash/desktop_background/desktop_background_view.cc
@@ -5,7 +5,6 @@
#include "ash/desktop_background/desktop_background_view.h"
#include "ash/aura/wm_window_aura.h"
-#include "ash/common/display/display_info.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm_lookup.h"
@@ -16,6 +15,7 @@
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ui/display/display.h"
+#include "ui/display/manager/managed_display_info.h"
#include "ui/display/screen.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/safe_integer_conversions.h"
@@ -42,7 +42,7 @@ class LayerControlView : public views::View {
void Layout() override {
WmWindow* window = WmLookup::Get()->GetWindowForWidget(GetWidget());
display::Display display = window->GetDisplayNearestWindow();
- DisplayInfo info = WmShell::Get()->GetDisplayInfo(display.id());
+ ui::ManagedDisplayInfo info = WmShell::Get()->GetDisplayInfo(display.id());
float ui_scale = info.GetEffectiveUIScale();
gfx::Size rounded_size =
gfx::ScaleToFlooredSize(display.size(), 1.f / ui_scale);

Powered by Google App Engine
This is Rietveld 408576698