| Index: ui/views/examples/text_example.cc
|
| diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc
|
| index e6298e2a9d457cee84975280707ee09112eec98b..5fb666229ef79c698d78bff06a440d2f4d3968a9 100644
|
| --- a/ui/views/examples/text_example.cc
|
| +++ b/ui/views/examples/text_example.cc
|
| @@ -68,13 +68,6 @@ const char* kHorizontalAligments[] = {
|
| "Right",
|
| };
|
|
|
| -const char* kVerticalAlignments[] = {
|
| - "Default",
|
| - "Top",
|
| - "Middle",
|
| - "Bottom",
|
| -};
|
| -
|
| // Toggles bit |flag| on |flags| based on state of |checkbox|.
|
| void SetFlagFromCheckbox(Checkbox* checkbox, int* flags, int flag) {
|
| if (checkbox->checked())
|
| @@ -222,10 +215,6 @@ void TextExample::CreateExampleView(View* container) {
|
| "H-Align",
|
| kHorizontalAligments,
|
| arraysize(kHorizontalAligments));
|
| - v_align_cb_ = AddCombobox(layout,
|
| - "V-Align",
|
| - kVerticalAlignments,
|
| - arraysize(kVerticalAlignments));
|
| eliding_cb_ = AddCombobox(layout,
|
| "Eliding",
|
| kElidingBehaviors,
|
| @@ -293,23 +282,6 @@ void TextExample::OnSelectedIndexChanged(Combobox* combobox) {
|
| text_flags |= gfx::Canvas::TEXT_ALIGN_RIGHT;
|
| break;
|
| }
|
| - } else if (combobox == v_align_cb_) {
|
| - text_flags &= ~(gfx::Canvas::TEXT_VALIGN_TOP |
|
| - gfx::Canvas::TEXT_VALIGN_MIDDLE |
|
| - gfx::Canvas::TEXT_VALIGN_BOTTOM);
|
| - switch (combobox->selected_index()) {
|
| - case 0:
|
| - break;
|
| - case 1:
|
| - text_flags |= gfx::Canvas::TEXT_VALIGN_TOP;
|
| - break;
|
| - case 2:
|
| - text_flags |= gfx::Canvas::TEXT_VALIGN_MIDDLE;
|
| - break;
|
| - case 3:
|
| - text_flags |= gfx::Canvas::TEXT_VALIGN_BOTTOM;
|
| - break;
|
| - }
|
| } else if (combobox == text_cb_) {
|
| switch (combobox->selected_index()) {
|
| case 0:
|
|
|