views: Rename Combobox "selected getter/setter" accessors to something more accurate.

ui/views/controls/combobox/native_combobox_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/combobox/native_combobox_win.h"
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 47 matching lines @@
     // text is displayed correctly in right-to-left UIs.
     base::i18n::AdjustStringForLocaleDirection(&text);
 
     SendMessage(native_view(), CB_ADDSTRING, 0,
                 reinterpret_cast<LPARAM>(UTF16ToWide(text).c_str()));
     max_width = std::max(max_width, font.GetStringWidth(text));
   }
   content_width_ = max_width;
 
   if (num_items > 0) {
-    SendMessage(native_view(), CB_SETCURSEL, combobox_->selected_item(), 0);
+    SendMessage(native_view(), CB_SETCURSEL, combobox_->selected_index(), 0);
 
     // Set the width for the drop down while accounting for the scrollbar and
     // borders.
     if (num_items > ComboBox_GetMinVisible(native_view()))
       max_width += GetSystemMetrics(SM_CXVSCROLL);
     // SM_CXEDGE would not be correct here, since the dropdown is flat, not 3D.
     int kComboboxDropdownBorderSize = 1;
     max_width += 2 * kComboboxDropdownBorderSize + kComboboxExtraPaddingX;
     SendMessage(native_view(), CB_SETDROPPEDWIDTH, max_width, 0);
   }
 }
 
-void NativeComboboxWin::UpdateSelectedItem() {
+void NativeComboboxWin::UpdateSelectedIndex() {
   // Note that we use CB_SETCURSEL and not CB_SELECTSTRING because on RTL
   // locales the strings we get from our ComboBox::Model might be augmented
-  // with Unicode directionality marks before we insert them into the combo box
+  // with Unicode directionality marks before we insert them into the combobox
   // and therefore we can not assume that the string we get from
-  // ComboBox::Model can be safely searched for and selected (which is what
+  // ui::ComboboxModel can be safely searched for and selected (which is what
   // CB_SELECTSTRING does).
-  SendMessage(native_view(), CB_SETCURSEL, combobox_->selected_item(), 0);
+  SendMessage(native_view(), CB_SETCURSEL, combobox_->selected_index(), 0);
 }
 
 void NativeComboboxWin::UpdateEnabled() {
   SetEnabled(combobox_->enabled());
 }
 
-int NativeComboboxWin::GetSelectedItem() const {
-  LRESULT selected_item = SendMessage(native_view(), CB_GETCURSEL, 0, 0);
-  return selected_item != CB_ERR ? selected_item : -1;
+int NativeComboboxWin::GetSelectedIndex() const {
+  LRESULT selected_index = SendMessage(native_view(), CB_GETCURSEL, 0, 0);
+  return selected_index != CB_ERR ? selected_index : -1;
 }
 
 bool NativeComboboxWin::IsDropdownOpen() const {
   return SendMessage(native_view(), CB_GETDROPPEDSTATE, 0, 0) != 0;
 }
 
 gfx::Size NativeComboboxWin::GetPreferredSize() {
   COMBOBOXINFO cbi = { 0 };
   cbi.cbSize = sizeof(cbi);
   // Note: Don't use CB_GETCOMBOBOXINFO since that crashes on WOW64 systems
@@ skipping 98 matching lines @@
 
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   if (Widget::IsPureViews())
     return new NativeComboboxViews(combobox);
   return new NativeComboboxWin(combobox);
 }
 
 }  // namespace views