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

Unified Diff: ash/app_list/app_list_presenter_delegate.cc

Issue 2860163005: chromeos: gets rid of wm_screen_util (Closed)
Patch Set: include Created 3 years, 7 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/app_list/app_list_presenter_delegate.cc
diff --git a/ash/app_list/app_list_presenter_delegate.cc b/ash/app_list/app_list_presenter_delegate.cc
index 3a1f918c6985516d21f3133561efd7c1829855e3..9a782bb04343cd00e2432a90a488c12725025aec 100644
--- a/ash/app_list/app_list_presenter_delegate.cc
+++ b/ash/app_list/app_list_presenter_delegate.cc
@@ -16,7 +16,6 @@
#include "ash/shell.h"
#include "ash/shell_port.h"
#include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/wm_screen_util.h"
#include "ash/wm_window.h"
#include "base/command_line.h"
#include "ui/app_list/app_list_constants.h"
@@ -38,7 +37,8 @@ namespace {
// that height (so that the app list never starts above the top of the screen).
gfx::Point GetCenterOfDisplayForWindow(WmWindow* window, int minimum_height) {
DCHECK(window);
- gfx::Rect bounds = wm::GetDisplayBoundsWithShelf(window);
+ gfx::Rect bounds =
+ ScreenUtil::GetDisplayBoundsWithShelf(window->aura_window());
bounds = window->GetRootWindow()->ConvertRectToScreen(bounds);
// If the virtual keyboard is active, subtract it from the display bounds, so

Powered by Google App Engine
This is Rietveld 408576698