Index: ash/shelf/shelf_bezel_event_handler.cc |
diff --git a/ash/shelf/shelf_bezel_event_handler.cc b/ash/shelf/shelf_bezel_event_handler.cc |
index 1545ea77b0e497ff47d69b574f4eae14e8a2256d..75b7445a3251234ab16f801e74c744f476e6ce29 100644 |
--- a/ash/shelf/shelf_bezel_event_handler.cc |
+++ b/ash/shelf/shelf_bezel_event_handler.cc |
@@ -4,7 +4,7 @@ |
#include "ash/shelf/shelf_bezel_event_handler.h" |
-#include "ash/shelf/wm_shelf.h" |
+#include "ash/shelf/shelf.h" |
#include "ash/shell.h" |
#include "ui/aura/window.h" |
#include "ui/display/display.h" |
@@ -16,7 +16,7 @@ |
namespace ash { |
-ShelfBezelEventHandler::ShelfBezelEventHandler(WmShelf* shelf) |
+ShelfBezelEventHandler::ShelfBezelEventHandler(Shelf* shelf) |
: shelf_(shelf), in_touch_drag_(false) { |
Shell::Get()->AddPreTargetHandler(this); |
} |
@@ -54,7 +54,7 @@ void ShelfBezelEventHandler::OnGestureEvent(ui::GestureEvent* event) { |
bool ShelfBezelEventHandler::IsShelfOnBezel(const gfx::Rect& screen, |
const gfx::Point& point) const { |
- switch (shelf_->GetAlignment()) { |
+ switch (shelf_->alignment()) { |
case SHELF_ALIGNMENT_BOTTOM: |
case SHELF_ALIGNMENT_BOTTOM_LOCKED: |
return point.y() >= screen.bottom(); |