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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/palette/palette_utils.cc

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)
Patch Set: Sync and rebase. 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
« ash/shell.h ('K') | « ash/shell_unittest.cc ('k') | ash/system/session/logout_confirmation_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/palette/palette_utils.cc
diff --git a/ash/system/palette/palette_utils.cc b/ash/system/palette/palette_utils.cc
index 97b7928537c1dc1cb25687c0141a37ede93b1135..09e3b015b33d809c598285adb2327b4c136f59de 100644
--- a/ash/system/palette/palette_utils.cc
+++ b/ash/system/palette/palette_utils.cc
@@ -8,7 +8,6 @@
#include "ash/palette_delegate.h"
#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
-#include "ash/shell_port.h"
#include "ash/system/palette/palette_tray.h"
#include "ash/system/status_area_widget.h"
#include "ash/wm_window.h"
@@ -55,7 +54,7 @@ bool ShouldShowPalette() {
}
bool PaletteContainsPointInScreen(const gfx::Point& point) {
- for (WmWindow* window : ShellPort::Get()->GetAllRootWindows()) {
+ for (aura::Window* window : Shell::GetAllRootWindows()) {
PaletteTray* palette_tray =
WmShelf::ForWindow(window)->GetStatusAreaWidget()->palette_tray();
if (palette_tray && palette_tray->ContainsPointInScreen(point))
« ash/shell.h ('K') | « ash/shell_unittest.cc ('k') | ash/system/session/logout_confirmation_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698