OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/wm/window_animations.h" | 5 #include "ash/wm/window_animations.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
| 12 #include "ash/common/wm/window_animation_types.h" |
12 #include "ash/screen_util.h" | 13 #include "ash/screen_util.h" |
13 #include "ash/shelf/shelf.h" | 14 #include "ash/shelf/shelf.h" |
14 #include "ash/shelf/shelf_layout_manager.h" | 15 #include "ash/shelf/shelf_layout_manager.h" |
15 #include "ash/shelf/shelf_widget.h" | 16 #include "ash/shelf/shelf_widget.h" |
16 #include "ash/wm/common/window_animation_types.h" | |
17 #include "ash/wm/window_util.h" | 17 #include "ash/wm/window_util.h" |
18 #include "ash/wm/workspace_controller.h" | 18 #include "ash/wm/workspace_controller.h" |
19 #include "base/command_line.h" | 19 #include "base/command_line.h" |
20 #include "base/compiler_specific.h" | 20 #include "base/compiler_specific.h" |
21 #include "base/logging.h" | 21 #include "base/logging.h" |
22 #include "base/message_loop/message_loop.h" | 22 #include "base/message_loop/message_loop.h" |
23 #include "base/stl_util.h" | 23 #include "base/stl_util.h" |
24 #include "base/time/time.h" | 24 #include "base/time/time.h" |
25 #include "ui/aura/client/aura_constants.h" | 25 #include "ui/aura/client/aura_constants.h" |
26 #include "ui/aura/window.h" | 26 #include "ui/aura/window.h" |
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
486 gfx::Rect work_area = | 486 gfx::Rect work_area = |
487 display::Screen::GetScreen()->GetDisplayNearestWindow(window).work_area(); | 487 display::Screen::GetScreen()->GetDisplayNearestWindow(window).work_area(); |
488 int ltr_adjusted_x = base::i18n::IsRTL() ? work_area.right() : work_area.x(); | 488 int ltr_adjusted_x = base::i18n::IsRTL() ? work_area.right() : work_area.x(); |
489 return shelf->SelectValueForShelfAlignment( | 489 return shelf->SelectValueForShelfAlignment( |
490 gfx::Rect(ltr_adjusted_x, work_area.bottom(), 0, 0), | 490 gfx::Rect(ltr_adjusted_x, work_area.bottom(), 0, 0), |
491 gfx::Rect(work_area.x(), work_area.y(), 0, 0), | 491 gfx::Rect(work_area.x(), work_area.y(), 0, 0), |
492 gfx::Rect(work_area.right(), work_area.y(), 0, 0)); | 492 gfx::Rect(work_area.right(), work_area.y(), 0, 0)); |
493 } | 493 } |
494 | 494 |
495 } // namespace ash | 495 } // namespace ash |
OLD | NEW |