| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
| 6 #include "ui/base/keycodes/keyboard_codes.h" | 6 #include "ui/base/keycodes/keyboard_codes.h" |
| 7 #include "ui/base/models/combobox_model.h" | 7 #include "ui/base/models/combobox_model.h" |
| 8 #include "ui/views/controls/combobox/combobox.h" |
| 9 #include "ui/views/controls/combobox/native_combobox_views.h" |
| 8 #include "ui/views/ime/mock_input_method.h" | 10 #include "ui/views/ime/mock_input_method.h" |
| 9 #include "ui/views/test/views_test_base.h" | 11 #include "ui/views/test/views_test_base.h" |
| 10 #include "ui/views/widget/native_widget_private.h" | 12 #include "ui/views/widget/native_widget_private.h" |
| 11 #include "ui/views/widget/widget.h" | 13 #include "ui/views/widget/widget.h" |
| 12 #include "views/controls/combobox/combobox.h" | |
| 13 #include "views/controls/combobox/native_combobox_views.h" | |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 // A wrapper of Combobox to intercept the result of OnKeyPressed() and | 17 // A wrapper of Combobox to intercept the result of OnKeyPressed() and |
| 18 // OnKeyReleased() methods. | 18 // OnKeyReleased() methods. |
| 19 class TestCombobox : public views::Combobox { | 19 class TestCombobox : public views::Combobox { |
| 20 public: | 20 public: |
| 21 TestCombobox(ui::ComboboxModel* model) | 21 TestCombobox(ui::ComboboxModel* model) |
| 22 : Combobox(model), | 22 : Combobox(model), |
| 23 key_handled_(false), | 23 key_handled_(false), |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 SendKeyEvent(ui::VKEY_DOWN); | 157 SendKeyEvent(ui::VKEY_DOWN); |
| 158 SendKeyEvent(ui::VKEY_DOWN); | 158 SendKeyEvent(ui::VKEY_DOWN); |
| 159 EXPECT_EQ(combobox_->selected_item(), 2); | 159 EXPECT_EQ(combobox_->selected_item(), 2); |
| 160 SendKeyEvent(ui::VKEY_RIGHT); | 160 SendKeyEvent(ui::VKEY_RIGHT); |
| 161 EXPECT_EQ(combobox_->selected_item(), 2); | 161 EXPECT_EQ(combobox_->selected_item(), 2); |
| 162 SendKeyEvent(ui::VKEY_LEFT); | 162 SendKeyEvent(ui::VKEY_LEFT); |
| 163 EXPECT_EQ(combobox_->selected_item(), 2); | 163 EXPECT_EQ(combobox_->selected_item(), 2); |
| 164 } | 164 } |
| 165 | 165 |
| 166 } // namespace views | 166 } // namespace views |
| OLD | NEW |