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/combobox/combobox.h" | 5 #include "ui/views/controls/combobox/combobox.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
| 14 #include "ui/accessibility/ax_enums.h" |
14 #include "ui/accessibility/ax_view_state.h" | 15 #include "ui/accessibility/ax_view_state.h" |
15 #include "ui/base/default_style.h" | 16 #include "ui/base/default_style.h" |
16 #include "ui/base/ime/input_method.h" | 17 #include "ui/base/ime/input_method.h" |
17 #include "ui/base/models/combobox_model.h" | 18 #include "ui/base/models/combobox_model.h" |
18 #include "ui/base/models/combobox_model_observer.h" | 19 #include "ui/base/models/combobox_model_observer.h" |
19 #include "ui/base/resource/resource_bundle.h" | 20 #include "ui/base/resource/resource_bundle.h" |
20 #include "ui/events/event.h" | 21 #include "ui/events/event.h" |
21 #include "ui/gfx/animation/throb_animation.h" | 22 #include "ui/gfx/animation/throb_animation.h" |
22 #include "ui/gfx/canvas.h" | 23 #include "ui/gfx/canvas.h" |
23 #include "ui/gfx/color_palette.h" | 24 #include "ui/gfx/color_palette.h" |
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
897 | 898 |
898 int Combobox::GetArrowContainerWidth() const { | 899 int Combobox::GetArrowContainerWidth() const { |
899 const int kNormalPadding = 7; | 900 const int kNormalPadding = 7; |
900 int padding = style_ == STYLE_NORMAL | 901 int padding = style_ == STYLE_NORMAL |
901 ? kNormalPadding * 2 | 902 ? kNormalPadding * 2 |
902 : kActionLeftPadding + kActionRightPadding; | 903 : kActionLeftPadding + kActionRightPadding; |
903 return ArrowSize().width() + padding; | 904 return ArrowSize().width() + padding; |
904 } | 905 } |
905 | 906 |
906 } // namespace views | 907 } // namespace views |
OLD | NEW |