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

Unified Diff: ash/wallpaper/wallpaper_controller.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/touch/touchscreen_util_unittest.cc ('k') | ash/wallpaper/wallpaper_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wallpaper/wallpaper_controller.cc
diff --git a/ash/wallpaper/wallpaper_controller.cc b/ash/wallpaper/wallpaper_controller.cc
index b0294e2ada1f415982d2d54382cf4dcc1d1f16ba..59f055eef0b4b3ba096804bdf20f299808644ce6 100644
--- a/ash/wallpaper/wallpaper_controller.cc
+++ b/ash/wallpaper/wallpaper_controller.cc
@@ -5,7 +5,6 @@
#include "ash/wallpaper/wallpaper_controller.h"
#include "ash/aura/wm_window_aura.h"
-#include "ash/common/display/display_info.h"
#include "ash/common/shell_window_ids.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
#include "ash/common/wm_shell.h"
@@ -19,6 +18,7 @@
#include "base/threading/sequenced_worker_pool.h"
#include "components/wallpaper/wallpaper_resizer.h"
#include "ui/aura/window.h"
+#include "ui/display/manager/managed_display_info.h"
#include "ui/display/screen.h"
#include "ui/views/widget/widget.h"
@@ -149,7 +149,8 @@ gfx::Size WallpaperController::GetMaxDisplaySizeInNative() {
gfx::Size max;
for (const auto& display : display::Screen::GetScreen()->GetAllDisplays()) {
- // Use the native size, not DisplayInfo::size_in_pixel or Display::size.
+ // Use the native size, not ManagedDisplayInfo::size_in_pixel or
+ // Display::size.
// TODO(msw): Avoid using Display::size here; see http://crbug.com/613657.
gfx::Size size = display.size();
if (shell)
« no previous file with comments | « ash/touch/touchscreen_util_unittest.cc ('k') | ash/wallpaper/wallpaper_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698