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 "ui/views/controls/menu/submenu_view.h" | 5 #include "ui/views/controls/menu/submenu_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "ui/accessibility/ax_enums.h" |
10 #include "ui/accessibility/ax_view_state.h" | 11 #include "ui/accessibility/ax_view_state.h" |
11 #include "ui/base/ime/input_method.h" | 12 #include "ui/base/ime/input_method.h" |
12 #include "ui/compositor/paint_recorder.h" | 13 #include "ui/compositor/paint_recorder.h" |
13 #include "ui/events/event.h" | 14 #include "ui/events/event.h" |
14 #include "ui/gfx/canvas.h" | 15 #include "ui/gfx/canvas.h" |
15 #include "ui/gfx/geometry/safe_integer_conversions.h" | 16 #include "ui/gfx/geometry/safe_integer_conversions.h" |
16 #include "ui/views/controls/menu/menu_config.h" | 17 #include "ui/views/controls/menu/menu_config.h" |
17 #include "ui/views/controls/menu/menu_controller.h" | 18 #include "ui/views/controls/menu/menu_controller.h" |
18 #include "ui/views/controls/menu/menu_host.h" | 19 #include "ui/views/controls/menu/menu_host.h" |
19 #include "ui/views/controls/menu/menu_item_view.h" | 20 #include "ui/views/controls/menu/menu_item_view.h" |
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
509 y = std::max(y, 0); | 510 y = std::max(y, 0); |
510 gfx::Rect new_vis_bounds(x, y, vis_bounds.width(), vis_bounds.height()); | 511 gfx::Rect new_vis_bounds(x, y, vis_bounds.width(), vis_bounds.height()); |
511 if (new_vis_bounds != vis_bounds) { | 512 if (new_vis_bounds != vis_bounds) { |
512 ScrollRectToVisible(new_vis_bounds); | 513 ScrollRectToVisible(new_vis_bounds); |
513 return true; | 514 return true; |
514 } | 515 } |
515 return false; | 516 return false; |
516 } | 517 } |
517 | 518 |
518 } // namespace views | 519 } // namespace views |
OLD | NEW |