| 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/shelf/shelf_view.h" | 5 #include "ash/shelf/shelf_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/ash_constants.h" | 9 #include "ash/ash_constants.h" |
| 10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #include "ui/aura/client/screen_position_client.h" | 38 #include "ui/aura/client/screen_position_client.h" |
| 39 #include "ui/aura/window.h" | 39 #include "ui/aura/window.h" |
| 40 #include "ui/aura/window_event_dispatcher.h" | 40 #include "ui/aura/window_event_dispatcher.h" |
| 41 #include "ui/base/l10n/l10n_util.h" | 41 #include "ui/base/l10n/l10n_util.h" |
| 42 #include "ui/base/models/simple_menu_model.h" | 42 #include "ui/base/models/simple_menu_model.h" |
| 43 #include "ui/base/resource/resource_bundle.h" | 43 #include "ui/base/resource/resource_bundle.h" |
| 44 #include "ui/compositor/layer.h" | 44 #include "ui/compositor/layer.h" |
| 45 #include "ui/compositor/layer_animator.h" | 45 #include "ui/compositor/layer_animator.h" |
| 46 #include "ui/compositor/scoped_animation_duration_scale_mode.h" | 46 #include "ui/compositor/scoped_animation_duration_scale_mode.h" |
| 47 #include "ui/gfx/canvas.h" | 47 #include "ui/gfx/canvas.h" |
| 48 #include "ui/gfx/point.h" | 48 #include "ui/gfx/geometry/point.h" |
| 49 #include "ui/views/animation/bounds_animator.h" | 49 #include "ui/views/animation/bounds_animator.h" |
| 50 #include "ui/views/border.h" | 50 #include "ui/views/border.h" |
| 51 #include "ui/views/controls/button/image_button.h" | 51 #include "ui/views/controls/button/image_button.h" |
| 52 #include "ui/views/controls/menu/menu_model_adapter.h" | 52 #include "ui/views/controls/menu/menu_model_adapter.h" |
| 53 #include "ui/views/controls/menu/menu_runner.h" | 53 #include "ui/views/controls/menu/menu_runner.h" |
| 54 #include "ui/views/focus/focus_search.h" | 54 #include "ui/views/focus/focus_search.h" |
| 55 #include "ui/views/view_model.h" | 55 #include "ui/views/view_model.h" |
| 56 #include "ui/views/view_model_utils.h" | 56 #include "ui/views/view_model_utils.h" |
| 57 #include "ui/views/widget/widget.h" | 57 #include "ui/views/widget/widget.h" |
| 58 | 58 |
| (...skipping 1859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1918 distance = bounds.x() - coordinate.x(); | 1918 distance = bounds.x() - coordinate.x(); |
| 1919 break; | 1919 break; |
| 1920 case SHELF_ALIGNMENT_TOP: | 1920 case SHELF_ALIGNMENT_TOP: |
| 1921 distance = coordinate.y() - bounds.bottom(); | 1921 distance = coordinate.y() - bounds.bottom(); |
| 1922 break; | 1922 break; |
| 1923 } | 1923 } |
| 1924 return distance > 0 ? distance : 0; | 1924 return distance > 0 ? distance : 0; |
| 1925 } | 1925 } |
| 1926 | 1926 |
| 1927 } // namespace ash | 1927 } // namespace ash |
| OLD | NEW |