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

Unified Diff: ash/wm/window_animations.cc

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again Created 4 years, 6 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/wm/panels/panel_window_resizer_unittest.cc ('k') | ash/wm/workspace_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_animations.cc
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index e635553b753fd274335feb9fe56947642681cda0..9cfc41523b5c687bb82b15cec4aa5a4905df9ed7 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -470,9 +470,9 @@ gfx::Rect GetMinimizeAnimationTargetBoundsInScreen(aura::Window* window) {
if (item_rect.width() != 0 || item_rect.height() != 0) {
if (shelf->shelf_layout_manager()->visibility_state() == SHELF_AUTO_HIDE) {
gfx::Rect shelf_bounds = shelf->shelf_widget()->GetWindowBoundsInScreen();
- if (shelf->alignment() == wm::SHELF_ALIGNMENT_LEFT)
+ if (shelf->alignment() == SHELF_ALIGNMENT_LEFT)
item_rect.set_x(shelf_bounds.right());
- else if (shelf->alignment() == wm::SHELF_ALIGNMENT_RIGHT)
+ else if (shelf->alignment() == SHELF_ALIGNMENT_RIGHT)
item_rect.set_x(shelf_bounds.x());
else
item_rect.set_y(shelf_bounds.y());
« no previous file with comments | « ash/wm/panels/panel_window_resizer_unittest.cc ('k') | ash/wm/workspace_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698