Index: ash/shelf/shelf_layout_manager.h |
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h |
index 5a88d01965910d9dd833a5b60fa89b34def4b363..eb5740f0eef4c63c5142fdc691c5b816db57334c 100644 |
--- a/ash/shelf/shelf_layout_manager.h |
+++ b/ash/shelf/shelf_layout_manager.h |
@@ -100,8 +100,9 @@ class ASH_EXPORT ShelfLayoutManager |
// Updates the auto-hide state for certain events. |
// TODO(mash): Add similar event handling support for mash. |
- void UpdateAutoHideForMouseEvent(ui::MouseEvent* event, WmWindow* target); |
- void UpdateAutoHideForGestureEvent(ui::GestureEvent* event, WmWindow* target); |
+ void UpdateAutoHideForMouseEvent(ui::MouseEvent* event, aura::Window* target); |
+ void UpdateAutoHideForGestureEvent(ui::GestureEvent* event, |
+ aura::Window* target); |
ShelfVisibilityState visibility_state() const { |
return state_.visibility_state; |
@@ -270,7 +271,7 @@ class ASH_EXPORT ShelfLayoutManager |
ShelfVisibilityState visibility_state) const; |
// Returns true if |window| is a descendant of the shelf. |
- bool IsShelfWindow(WmWindow* window); |
+ bool IsShelfWindow(aura::Window* window); |
int GetWorkAreaInsets(const State& state, int size) const; |