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

Unified Diff: ash/common/system/toast/toast_overlay.cc

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)
Patch Set: rebase again 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
« no previous file with comments | « ash/common/shelf/wm_shelf.cc ('k') | ash/common/wm/dock/docked_window_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/toast/toast_overlay.cc
diff --git a/ash/common/system/toast/toast_overlay.cc b/ash/common/system/toast/toast_overlay.cc
index 544b196ccc8a5abb61b203f44eec8c69137d8a02..21f27dd9399fb3f1e4e1c74e7ed1a2aee26d3882 100644
--- a/ash/common/system/toast/toast_overlay.cc
+++ b/ash/common/system/toast/toast_overlay.cc
@@ -55,10 +55,7 @@ const int kToastMinimumWidth = 288;
// Returns the work area bounds for the root window where new windows are added
// (including new toasts).
gfx::Rect GetUserWorkAreaBounds() {
- return WmShell::Get()
- ->GetRootWindowForNewWindows()
- ->GetRootWindowController()
- ->GetShelf()
+ return WmShelf::ForWindow(WmShell::Get()->GetRootWindowForNewWindows())
->GetUserWorkAreaBounds();
}
« no previous file with comments | « ash/common/shelf/wm_shelf.cc ('k') | ash/common/wm/dock/docked_window_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698