| 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 18 matching lines...) Expand all Loading... |
| 29 #include "ash/shelf/shelf_tooltip_manager.h" | 29 #include "ash/shelf/shelf_tooltip_manager.h" |
| 30 #include "ash/shelf/shelf_widget.h" | 30 #include "ash/shelf/shelf_widget.h" |
| 31 #include "ash/shell.h" | 31 #include "ash/shell.h" |
| 32 #include "ash/wm/coordinate_conversion.h" | 32 #include "ash/wm/coordinate_conversion.h" |
| 33 #include "base/auto_reset.h" | 33 #include "base/auto_reset.h" |
| 34 #include "base/memory/scoped_ptr.h" | 34 #include "base/memory/scoped_ptr.h" |
| 35 #include "base/metrics/histogram.h" | 35 #include "base/metrics/histogram.h" |
| 36 #include "grit/ash_resources.h" | 36 #include "grit/ash_resources.h" |
| 37 #include "grit/ash_strings.h" | 37 #include "grit/ash_strings.h" |
| 38 #include "ui/aura/client/screen_position_client.h" | 38 #include "ui/aura/client/screen_position_client.h" |
| 39 #include "ui/aura/root_window.h" | |
| 40 #include "ui/aura/window.h" | 39 #include "ui/aura/window.h" |
| 40 #include "ui/aura/window_event_dispatcher.h" |
| 41 #include "ui/base/accessibility/accessible_view_state.h" | 41 #include "ui/base/accessibility/accessible_view_state.h" |
| 42 #include "ui/base/l10n/l10n_util.h" | 42 #include "ui/base/l10n/l10n_util.h" |
| 43 #include "ui/base/models/simple_menu_model.h" | 43 #include "ui/base/models/simple_menu_model.h" |
| 44 #include "ui/base/resource/resource_bundle.h" | 44 #include "ui/base/resource/resource_bundle.h" |
| 45 #include "ui/compositor/layer.h" | 45 #include "ui/compositor/layer.h" |
| 46 #include "ui/compositor/layer_animator.h" | 46 #include "ui/compositor/layer_animator.h" |
| 47 #include "ui/compositor/scoped_animation_duration_scale_mode.h" | 47 #include "ui/compositor/scoped_animation_duration_scale_mode.h" |
| 48 #include "ui/gfx/canvas.h" | 48 #include "ui/gfx/canvas.h" |
| 49 #include "ui/gfx/point.h" | 49 #include "ui/gfx/point.h" |
| 50 #include "ui/views/animation/bounds_animator.h" | 50 #include "ui/views/animation/bounds_animator.h" |
| (...skipping 1997 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2048 break; | 2048 break; |
| 2049 case SHELF_ALIGNMENT_TOP: | 2049 case SHELF_ALIGNMENT_TOP: |
| 2050 distance = coordinate.y() - bounds.bottom(); | 2050 distance = coordinate.y() - bounds.bottom(); |
| 2051 break; | 2051 break; |
| 2052 } | 2052 } |
| 2053 return distance > 0 ? distance : 0; | 2053 return distance > 0 ? distance : 0; |
| 2054 } | 2054 } |
| 2055 | 2055 |
| 2056 } // namespace internal | 2056 } // namespace internal |
| 2057 } // namespace ash | 2057 } // namespace ash |
| OLD | NEW |