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

ui/views/controls/combobox/combobox.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/combobox.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 // static
 const char Combobox::kViewClassName[] = "views/Combobox";
 
 ////////////////////////////////////////////////////////////////////////////////
 // Combobox, public:
 
 Combobox::Combobox(ui::ComboboxModel* model)
     : native_wrapper_(NULL),
       model_(model),
       listener_(NULL),
-      selected_item_(0) {
+      selected_index_(0) {
+  DCHECK(model);
   set_focusable(true);
 }
 
 Combobox::~Combobox() {
 }
 
 // static
 const gfx::Font& Combobox::GetFont() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetFont(ui::ResourceBundle::BaseFont);
 }
 
 void Combobox::ModelChanged() {
-  selected_item_ = std::min(0, model_->GetItemCount());
+  selected_index_ = std::min(0, model_->GetItemCount());
   if (native_wrapper_)
     native_wrapper_->UpdateFromModel();
   PreferredSizeChanged();
 }
 
-void Combobox::SetSelectedItem(int index) {
-  selected_item_ = index;
+void Combobox::SetSelectedIndex(int index) {
+  selected_index_ = index;
   if (native_wrapper_)
-    native_wrapper_->UpdateSelectedItem();
+    native_wrapper_->UpdateSelectedIndex();
 }
 
 void Combobox::SelectionChanged() {
-  int prev_selected_item = selected_item_;
-  selected_item_ = native_wrapper_->GetSelectedItem();
+  int prev_selected_index = selected_index_;
+  selected_index_ = native_wrapper_->GetSelectedIndex();
   if (listener_)
-    listener_->ItemChanged(this, prev_selected_item, selected_item_);
+    listener_->ItemChanged(this, prev_selected_index, selected_index_);
   if (GetWidget()) {
     GetWidget()->NotifyAccessibilityEvent(
         this, ui::AccessibilityTypes::EVENT_VALUE_CHANGED, false);
   }
 }
 
 void Combobox::SetAccessibleName(const string16& name) {
   accessible_name_ = name;
 }
 
@@ skipping 52 matching lines @@
 }
 
 void Combobox::OnBlur() {
   if (native_wrapper_)
     native_wrapper_->HandleBlur();
 }
 
 void Combobox::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_COMBOBOX;
   state->name = accessible_name_;
-  state->value = model_->GetItemAt(selected_item_);
-  state->index = selected_item();
+  state->value = model_->GetItemAt(selected_index_);
+  state->index = selected_index_;
   state->count = model()->GetItemCount();
 }
 
 void Combobox::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
   if (is_add && !native_wrapper_ && GetWidget()) {
     // The native wrapper's lifetime will be managed by the view hierarchy after
     // we call AddChildView.
     native_wrapper_ = NativeComboboxWrapper::CreateWrapper(this);
     AddChildView(native_wrapper_->GetView());
     // The underlying native widget may not be created until the wrapper is
     // parented. For this reason the wrapper is only updated after adding its
     // view.
     native_wrapper_->UpdateFromModel();
-    native_wrapper_->UpdateSelectedItem();
+    native_wrapper_->UpdateSelectedIndex();
     native_wrapper_->UpdateEnabled();
   }
 }
 
 std::string Combobox::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views