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

Unified Diff: ash/shelf/shelf_locking_manager.cc

Issue 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nuke_aura_window
Patch Set: comment Created 4 years, 8 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/shelf/shelf_locking_manager.h ('k') | ash/shelf/shelf_locking_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_);
}
}
« no previous file with comments | « ash/shelf/shelf_locking_manager.h ('k') | ash/shelf/shelf_locking_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698