| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/strings/utf_string_conversions.h" | 5 #include "base/strings/utf_string_conversions.h" |
| 6 #include "ui/base/ime/candidate_window.h" | 6 #include "ui/base/ime/candidate_window.h" |
| 7 #include "ui/chromeos/ime/candidate_view.h" | 7 #include "ui/chromeos/ime/view/candidate_view.h" |
| 8 #include "ui/chromeos/ime/candidate_window_constants.h" | 8 #include "ui/chromeos/ime/view/candidate_window_constants.h" |
| 9 #include "ui/gfx/color_utils.h" | 9 #include "ui/gfx/color_utils.h" |
| 10 #include "ui/native_theme/native_theme.h" | 10 #include "ui/native_theme/native_theme.h" |
| 11 #include "ui/views/background.h" | 11 #include "ui/views/background.h" |
| 12 #include "ui/views/border.h" | 12 #include "ui/views/border.h" |
| 13 #include "ui/views/controls/label.h" | 13 #include "ui/views/controls/label.h" |
| 14 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
| 15 | 15 |
| 16 namespace ui { | 16 namespace ui { |
| 17 namespace ime { | 17 namespace ime { |
| 18 | 18 |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 } | 291 } |
| 292 | 292 |
| 293 // Reserves the margin for infolist_icon even if it's not visible. | 293 // Reserves the margin for infolist_icon even if it's not visible. |
| 294 size.Enlarge( | 294 size.Enlarge( |
| 295 kInfolistIndicatorIconWidth + kInfolistIndicatorIconPadding * 2, 0); | 295 kInfolistIndicatorIconWidth + kInfolistIndicatorIconPadding * 2, 0); |
| 296 return size; | 296 return size; |
| 297 } | 297 } |
| 298 | 298 |
| 299 } // namespace ime | 299 } // namespace ime |
| 300 } // namespace ui | 300 } // namespace ui |
| OLD | NEW |