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

Unified Diff: ash/desktop_background/desktop_background_controller.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_controller.cc
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc
index 510e9e789c01540d2aa9cd4764aa9d6151d08f6a..6e5313731de4530f485b6cd7a2c8f8f0768d8dc3 100644
--- a/ash/desktop_background/desktop_background_controller.cc
+++ b/ash/desktop_background/desktop_background_controller.cc
@@ -5,7 +5,6 @@
#include "ash/desktop_background/desktop_background_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/wm_shell.h"
#include "ash/desktop_background/desktop_background_controller_observer.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"
@@ -154,7 +154,8 @@ gfx::Size DesktopBackgroundController::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)

Powered by Google App Engine
This is Rietveld 408576698