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

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

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: 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
« no previous file with comments | « ash/system/palette/palette_tray.cc ('k') | ash/system/session/logout_button_tray.h » ('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 a26f9065e9f8a37ef318c2de0ddb0072bbe10ed7..b41bc3b655aeb6376ca7ca92bfa0965851c7864c 100644
--- a/ash/system/palette/palette_utils.cc
+++ b/ash/system/palette/palette_utils.cc
@@ -6,7 +6,7 @@
#include "ash/ash_switches.h"
#include "ash/palette_delegate.h"
-#include "ash/shelf/wm_shelf.h"
+#include "ash/shelf/shelf.h"
#include "ash/shell.h"
#include "ash/system/palette/palette_tray.h"
#include "ash/system/status_area_widget.h"
@@ -55,7 +55,7 @@ bool ShouldShowPalette() {
bool PaletteContainsPointInScreen(const gfx::Point& point) {
for (aura::Window* window : Shell::GetAllRootWindows()) {
PaletteTray* palette_tray =
- WmShelf::ForWindow(window)->GetStatusAreaWidget()->palette_tray();
+ Shelf::ForWindow(window)->GetStatusAreaWidget()->palette_tray();
if (palette_tray && palette_tray->ContainsPointInScreen(point))
return true;
}
« no previous file with comments | « ash/system/palette/palette_tray.cc ('k') | ash/system/session/logout_button_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698