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

Unified Diff: ash/wallpaper/wallpaper_view.cc

Issue 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased 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
« no previous file with comments | « ash/wallpaper/wallpaper_controller.cc ('k') | ash/wm/ash_native_cursor_manager_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wallpaper/wallpaper_view.cc
diff --git a/ash/wallpaper/wallpaper_view.cc b/ash/wallpaper/wallpaper_view.cc
index ce54266733b4b5d565bd38e8649fc0e8e7e63b91..379c9fcf2fa39b2829663eea7a6af8102a3fa338 100644
--- a/ash/wallpaper/wallpaper_view.cc
+++ b/ash/wallpaper/wallpaper_view.cc
@@ -5,7 +5,6 @@
#include "ash/wallpaper/wallpaper_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/wallpaper/wallpaper_delegate.h"
#include "ash/common/wm/overview/window_selector_controller.h"
@@ -16,6 +15,7 @@
#include "ash/wallpaper/wallpaper_controller.h"
#include "ash/wallpaper/wallpaper_widget_controller.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"
@@ -45,7 +45,8 @@ class LayerControlView : public views::View {
// wallpaper view such as an overview mode shield.
window->GetParent()->StackChildAtBottom(window);
display::Display display = window->GetDisplayNearestWindow();
- DisplayInfo info = WmShell::Get()->GetDisplayInfo(display.id());
+ display::ManagedDisplayInfo info =
+ WmShell::Get()->GetDisplayInfo(display.id());
float ui_scale = info.GetEffectiveUIScale();
gfx::Size rounded_size =
gfx::ScaleToFlooredSize(display.size(), 1.f / ui_scale);
« no previous file with comments | « ash/wallpaper/wallpaper_controller.cc ('k') | ash/wm/ash_native_cursor_manager_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698