mash: Migrate ShelfLayoutManager ScreenUtil usage to ash common types.

ash/screen_util.cc

Index: ash/screen_util.cc
diff --git a/ash/screen_util.cc b/ash/screen_util.cc
index 1ffa98cfce3d091ffb7bba0076a4e496f135fd65..8da7296950a25b25001f935154c414af0d5723ef 100644
--- a/ash/screen_util.cc
+++ b/ash/screen_util.cc
@@ -53,32 +53,6 @@ gfx::Rect ScreenUtil::GetDisplayWorkAreaBoundsInParent(aura::Window* window) {
 }
 
 // static
-gfx::Rect ScreenUtil::GetShelfDisplayBoundsInRoot(aura::Window* window) {
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  if (display_manager->IsInUnifiedMode()) {
-    // In unified desktop mode, there is only one shelf in the 1st display.
-    const display::Display& first =
-        display_manager->software_mirroring_display_list()[0];
-    float scale =
-        static_cast<float>(window->GetRootWindow()->bounds().height()) /
-        first.size().height();
-    gfx::SizeF size(first.size());
-    size.Scale(scale, scale);
-    return gfx::Rect(gfx::ToCeiledSize(size));
-  }
-
-  if (Shell::GetInstance()->in_mus()) {
-    // In mus the RootWindow is the widget's root window, so use the display
-    // bounds.
-    display::Display display =
-        display::Screen::GetScreen()->GetDisplayNearestWindow(window);
-    return display.bounds();
-  }
-
-  return window->GetRootWindow()->bounds();
-}
-
-// static
 gfx::Rect ScreenUtil::ConvertRectToScreen(aura::Window* window,
                                           const gfx::Rect& rect) {
   gfx::Point point = rect.origin();