Index: ash/shelf/shelf_locking_manager.cc |
diff --git a/ash/shelf/shelf_locking_manager.cc b/ash/shelf/shelf_locking_manager.cc |
index 70035cdbbb29aad57b22628dc3cd27dcea41a94b..93c8832b9e09b75b5a7f16d16a8fd5940e8b70f6 100644 |
--- a/ash/shelf/shelf_locking_manager.cc |
+++ b/ash/shelf/shelf_locking_manager.cc |
@@ -49,11 +49,11 @@ void ShelfLockingManager::OnLockStateEvent(EventType event) { |
} |
void ShelfLockingManager::UpdateLockedState() { |
- const ShelfAlignment alignment = shelf_->alignment(); |
- if (is_locked() && alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) { |
+ const wm::ShelfAlignment alignment = shelf_->alignment(); |
+ if (is_locked() && alignment != wm::SHELF_ALIGNMENT_BOTTOM_LOCKED) { |
stored_alignment_ = alignment; |
- shelf_->SetAlignment(SHELF_ALIGNMENT_BOTTOM_LOCKED); |
- } else if (!is_locked() && alignment == SHELF_ALIGNMENT_BOTTOM_LOCKED) { |
+ shelf_->SetAlignment(wm::SHELF_ALIGNMENT_BOTTOM_LOCKED); |
+ } else if (!is_locked() && alignment == wm::SHELF_ALIGNMENT_BOTTOM_LOCKED) { |
shelf_->SetAlignment(stored_alignment_); |
} |
} |