| 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/shelf/wm_shelf.h" | 12 #include "ash/shelf/wm_shelf.h" | 
| 13 #include "ash/common/wm/window_animation_types.h" | 13 #include "ash/wm/window_animation_types.h" | 
| 14 #include "ash/common/wm/workspace_controller.h" |  | 
| 15 #include "ash/common/wm_window.h" |  | 
| 16 #include "ash/wm/window_util.h" | 14 #include "ash/wm/window_util.h" | 
|  | 15 #include "ash/wm/workspace_controller.h" | 
|  | 16 #include "ash/wm_window.h" | 
| 17 #include "base/i18n/rtl.h" | 17 #include "base/i18n/rtl.h" | 
| 18 #include "base/logging.h" | 18 #include "base/logging.h" | 
| 19 #include "base/memory/ptr_util.h" | 19 #include "base/memory/ptr_util.h" | 
| 20 #include "base/stl_util.h" | 20 #include "base/stl_util.h" | 
| 21 #include "base/time/time.h" | 21 #include "base/time/time.h" | 
| 22 #include "ui/aura/client/aura_constants.h" | 22 #include "ui/aura/client/aura_constants.h" | 
| 23 #include "ui/aura/window.h" | 23 #include "ui/aura/window.h" | 
| 24 #include "ui/aura/window_observer.h" | 24 #include "ui/aura/window_observer.h" | 
| 25 #include "ui/base/class_property.h" | 25 #include "ui/base/class_property.h" | 
| 26 #include "ui/compositor/compositor_observer.h" | 26 #include "ui/compositor/compositor_observer.h" | 
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 451     case SHELF_ALIGNMENT_LEFT: | 451     case SHELF_ALIGNMENT_LEFT: | 
| 452       return gfx::Rect(work_area.x(), work_area.y(), 0, 0); | 452       return gfx::Rect(work_area.x(), work_area.y(), 0, 0); | 
| 453     case SHELF_ALIGNMENT_RIGHT: | 453     case SHELF_ALIGNMENT_RIGHT: | 
| 454       return gfx::Rect(work_area.right(), work_area.y(), 0, 0); | 454       return gfx::Rect(work_area.right(), work_area.y(), 0, 0); | 
| 455   } | 455   } | 
| 456   NOTREACHED(); | 456   NOTREACHED(); | 
| 457   return gfx::Rect(); | 457   return gfx::Rect(); | 
| 458 } | 458 } | 
| 459 | 459 | 
| 460 }  // namespace ash | 460 }  // namespace ash | 
| OLD | NEW | 
|---|