mash: Migrate ShelfLayoutManager ScreenUtil usage to ash common types.

ash/app_list/app_list_presenter_delegate.cc

 // Copyright (c) 2012 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/app_list/app_list_presenter_delegate.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/shelf/app_list_button.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/wm_screen_util.h"
+#include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/presenter/app_list_presenter.h"
@@ skipping 48 matching lines @@
           0, std::max(kMinimalAnchorPositionOffset - anchor.y(), 0));
   }
   NOTREACHED();
   return gfx::Vector2d();
 }
 
 // Gets the point at the center of the display that a particular view is on.
 // This calculation excludes the virtual keyboard area. If the height of the
 // display area is less than |minimum_height|, its bottom will be extended to
 // that height (so that the app list never starts above the top of the screen).
-gfx::Point GetCenterOfDisplayForView(const views::View* view,
-                                     int minimum_height) {
-  aura::Window* window = view->GetWidget()->GetNativeView();
-  gfx::Rect bounds = ScreenUtil::GetShelfDisplayBoundsInRoot(window);
-  bounds = ScreenUtil::ConvertRectToScreen(window->GetRootWindow(), bounds);
+gfx::Point GetCenterOfDisplayForView(views::View* view, int minimum_height) {
+  WmWindow* window = WmLookup::Get()->GetWindowForWidget(view->GetWidget());
+  gfx::Rect bounds = wm::GetDisplayBoundsWithShelf(window);
+  bounds = window->GetRootWindow()->ConvertRectToScreen(bounds);
 
   // If the virtual keyboard is active, subtract it from the display bounds, so
   // that the app list is centered in the non-keyboard area of the display.
   // (Note that work_area excludes the keyboard, but it doesn't get updated
   // until after this function is called.)
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   if (keyboard_controller && keyboard_controller->keyboard_visible())
     bounds.Subtract(keyboard_controller->current_keyboard_bounds());
 
@@ skipping 240 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListPresenterDelegate, ShelfIconObserver implementation:
 
 void AppListPresenterDelegate::OnShelfIconPositionsChanged() {
   UpdateBounds();
 }
 
 }  // namespace ash