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 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "ash/ash_constants.h" | 10 #include "ash/ash_constants.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "ash/shelf/shelf.h" | 25 #include "ash/shelf/shelf.h" |
26 #include "ash/shelf/shelf_button.h" | 26 #include "ash/shelf/shelf_button.h" |
27 #include "ash/shelf/shelf_delegate.h" | 27 #include "ash/shelf/shelf_delegate.h" |
28 #include "ash/shelf/shelf_icon_observer.h" | 28 #include "ash/shelf/shelf_icon_observer.h" |
29 #include "ash/shelf/shelf_widget.h" | 29 #include "ash/shelf/shelf_widget.h" |
30 #include "ash/shell.h" | 30 #include "ash/shell.h" |
31 #include "ash/shell_delegate.h" | 31 #include "ash/shell_delegate.h" |
32 #include "base/auto_reset.h" | 32 #include "base/auto_reset.h" |
33 #include "base/metrics/histogram.h" | 33 #include "base/metrics/histogram.h" |
34 #include "grit/ash_strings.h" | 34 #include "grit/ash_strings.h" |
| 35 #include "ui/accessibility/ax_enums.h" |
35 #include "ui/accessibility/ax_view_state.h" | 36 #include "ui/accessibility/ax_view_state.h" |
36 #include "ui/aura/client/screen_position_client.h" | 37 #include "ui/aura/client/screen_position_client.h" |
37 #include "ui/aura/window.h" | 38 #include "ui/aura/window.h" |
38 #include "ui/aura/window_event_dispatcher.h" | 39 #include "ui/aura/window_event_dispatcher.h" |
39 #include "ui/base/l10n/l10n_util.h" | 40 #include "ui/base/l10n/l10n_util.h" |
40 #include "ui/base/models/simple_menu_model.h" | 41 #include "ui/base/models/simple_menu_model.h" |
41 #include "ui/base/resource/resource_bundle.h" | 42 #include "ui/base/resource/resource_bundle.h" |
42 #include "ui/compositor/layer.h" | 43 #include "ui/compositor/layer.h" |
43 #include "ui/compositor/layer_animator.h" | 44 #include "ui/compositor/layer_animator.h" |
44 #include "ui/compositor/scoped_animation_duration_scale_mode.h" | 45 #include "ui/compositor/scoped_animation_duration_scale_mode.h" |
(...skipping 1852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1897 | 1898 |
1898 int ShelfView::CalculateShelfDistance(const gfx::Point& coordinate) const { | 1899 int ShelfView::CalculateShelfDistance(const gfx::Point& coordinate) const { |
1899 const gfx::Rect bounds = GetBoundsInScreen(); | 1900 const gfx::Rect bounds = GetBoundsInScreen(); |
1900 int distance = shelf_->SelectValueForShelfAlignment( | 1901 int distance = shelf_->SelectValueForShelfAlignment( |
1901 bounds.y() - coordinate.y(), coordinate.x() - bounds.right(), | 1902 bounds.y() - coordinate.y(), coordinate.x() - bounds.right(), |
1902 bounds.x() - coordinate.x()); | 1903 bounds.x() - coordinate.x()); |
1903 return distance > 0 ? distance : 0; | 1904 return distance > 0 ? distance : 0; |
1904 } | 1905 } |
1905 | 1906 |
1906 } // namespace ash | 1907 } // namespace ash |
OLD | NEW |