ui/views/controls/combobox/native_combobox_views_unittest.cc - Issue 9875001: views: Rename Combobox "selected getter/setter" accessors to something more accurate.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/combobox/native_combobox_views_unittest.cc

Issue 9875001: views: Rename Combobox "selected getter/setter" accessors to something more accurate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« ui/views/controls/combobox/combobox.h ('K') | « ui/views/controls/combobox/native_combobox_views.cc ('k') | ui/views/controls/combobox/native_combobox_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/controls/combobox/native_combobox_views_unittest.cc

diff --git a/ui/views/controls/combobox/native_combobox_views_unittest.cc b/ui/views/controls/combobox/native_combobox_views_unittest.cc

index 4143d221ce7f31c7a54b0c1d8171bf43a1722ed2..0d5e006fce28ef248f8694fc852b7563ca4d1b08 100644

--- a/ui/views/controls/combobox/native_combobox_views_unittest.cc

+++ b/ui/views/controls/combobox/native_combobox_views_unittest.cc

@@ -152,16 +152,16 @@ class NativeComboboxViewsTest : public ViewsTestBase {

TEST_F(NativeComboboxViewsTest, KeyTest) {

InitCombobox();

SendKeyEvent(ui::VKEY_END);

- EXPECT_EQ(combobox_->selected_item() + 1, model_->GetItemCount());

+ EXPECT_EQ(combobox_->selected_index() + 1, model_->GetItemCount());

SendKeyEvent(ui::VKEY_HOME);

- EXPECT_EQ(combobox_->selected_item(), 0);

+ EXPECT_EQ(combobox_->selected_index(), 0);

SendKeyEvent(ui::VKEY_DOWN);

- EXPECT_EQ(combobox_->selected_item(), 2);

+ EXPECT_EQ(combobox_->selected_index(), 2);

SendKeyEvent(ui::VKEY_RIGHT);

- EXPECT_EQ(combobox_->selected_item(), 2);

+ EXPECT_EQ(combobox_->selected_index(), 2);

SendKeyEvent(ui::VKEY_LEFT);

- EXPECT_EQ(combobox_->selected_item(), 2);

+ EXPECT_EQ(combobox_->selected_index(), 2);

}

// Check that if a combobox is disabled before it has a native wrapper, then the