mash: Migrate ShelfLayoutManager ScreenUtil usage to ash common types.

ash/screen_util.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/screen_util.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
@@ skipping 35 matching lines @@
 
 // static
 gfx::Rect ScreenUtil::GetDisplayWorkAreaBoundsInParent(aura::Window* window) {
   return ConvertRectFromScreen(window->parent(),
                                display::Screen::GetScreen()
                                    ->GetDisplayNearestWindow(window)
                                    .work_area());
 }
 
 // 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();
   aura::client::GetScreenPositionClient(window->GetRootWindow())
       ->ConvertPointToScreen(window, &point);
   return gfx::Rect(point, rect.size());
 }
 
 // static
 gfx::Rect ScreenUtil::ConvertRectFromScreen(aura::Window* window,
                                             const gfx::Rect& rect) {
   gfx::Point point = rect.origin();
   aura::client::GetScreenPositionClient(window->GetRootWindow())
       ->ConvertPointFromScreen(window, &point);
   return gfx::Rect(point, rect.size());
 }
 
 // static
 const display::Display& ScreenUtil::GetSecondaryDisplay() {
   DisplayManager* display_manager = GetDisplayManager();
   CHECK_LE(2U, display_manager->GetNumDisplays());
   return display_manager->GetDisplayAt(0).id() ==
                  display::Screen::GetScreen()->GetPrimaryDisplay().id()
              ? display_manager->GetDisplayAt(1)
              : display_manager->GetDisplayAt(0);
 }
 
 }  // namespace ash