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

ui/views/controls/combobox/native_combobox_views.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_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 37 matching lines @@
 // Define the id of the first item in the menu (since it needs to be > 0)
 const int kFirstMenuItemId = 1000;
 
 }  // namespace
 
 namespace views {
 
 const char NativeComboboxViews::kViewClassName[] =
     "views/NativeComboboxViews";
 
-NativeComboboxViews::NativeComboboxViews(Combobox* parent)
-    : combobox_(parent),
+NativeComboboxViews::NativeComboboxViews(Combobox* combo_box)
+    : combobox_(combo_box),
       text_border_(new FocusableBorder()),
       disclosure_arrow_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           IDR_DISCLOSURE_ARROW).ToSkBitmap()),
       dropdown_open_(false),
-      selected_item_(-1),
+      selected_index_(-1),
       content_width_(0),
       content_height_(0) {
   set_border(text_border_);
 }
 
 NativeComboboxViews::~NativeComboboxViews() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxViews, View overrides:
@@ skipping 10 matching lines @@
 
 bool NativeComboboxViews::OnMouseDragged(const views::MouseEvent& mouse_event) {
   return true;
 }
 
 bool NativeComboboxViews::OnKeyPressed(const views::KeyEvent& key_event) {
   // TODO(oshima): handle IME.
   DCHECK(key_event.type() == ui::ET_KEY_PRESSED);
 
   // Check if we are in the default state (-1) and set to first item.
-  if(selected_item_ == -1)
-    selected_item_ = 0;
+  if(selected_index_ == -1)
+    selected_index_ = 0;
 
-  int new_item = selected_item_;
-  switch(key_event.key_code()){
-
-    // move to the next element if any
+  int new_index = selected_index_;
+  switch (key_event.key_code()) {
+    // Move to the next element if any.
     case ui::VKEY_DOWN:
-      if (new_item < (combobox_->model()->GetItemCount() - 1))
-        new_item++;
+      if (new_index < (combobox_->model()->GetItemCount() - 1))
+        new_index++;
       break;
 
-    // move to the end of the list
+    // Move to the end of the list,
     case ui::VKEY_END:
     case ui::VKEY_NEXT:
-      new_item = combobox_->model()->GetItemCount() - 1;
+      new_index = combobox_->model()->GetItemCount() - 1;
       break;
 
-    // move to the top of the list
+    // Move to the top of the list.
    case ui::VKEY_HOME:
    case ui::VKEY_PRIOR:
-      new_item = 0;
+      new_index = 0;
       break;
 
     // move to the previous element if any
     case ui::VKEY_UP:
-      if (new_item > 0)
-        new_item--;
+      if (new_index > 0)
+        new_index--;
       break;
 
     default:
       return false;
-
   }
 
-  if(new_item != selected_item_) {
-    selected_item_ = new_item;
+  if (new_index != selected_index_) {
+    selected_index_ = new_index;
     combobox_->SelectionChanged();
     SchedulePaint();
   }
 
   return true;
 }
 
 bool NativeComboboxViews::OnKeyReleased(const views::KeyEvent& key_event) {
   return true;
 }
@@ skipping 33 matching lines @@
     base::i18n::AdjustStringForLocaleDirection(&text);
 
     menu->AppendMenuItem(i + kFirstMenuItemId, text, MenuItemView::NORMAL);
     max_width = std::max(max_width, font.GetStringWidth(text));
   }
 
   content_width_ = max_width;
   content_height_ = font.GetFontSize();
 }
 
-void NativeComboboxViews::UpdateSelectedItem() {
-  selected_item_ = combobox_->selected_item();
+void NativeComboboxViews::UpdateSelectedIndex() {
+  selected_index_ = combobox_->selected_index();
 }
 
 void NativeComboboxViews::UpdateEnabled() {
   SetEnabled(combobox_->enabled());
 }
 
-int NativeComboboxViews::GetSelectedItem() const {
-  return selected_item_;
+int NativeComboboxViews::GetSelectedIndex() const {
+  return selected_index_;
 }
 
 bool NativeComboboxViews::IsDropdownOpen() const {
   return dropdown_open_;
 }
 
 gfx::Size NativeComboboxViews::GetPreferredSize() {
   if (content_width_ == 0)
     UpdateFromModel();
 
@@ skipping 41 matching lines @@
 
 bool NativeComboboxViews::IsItemChecked(int id) const {
   return false;
 }
 
 bool NativeComboboxViews::IsCommandEnabled(int id) const {
   return true;
 }
 
 void NativeComboboxViews::ExecuteCommand(int id) {
-  // revert menu offset to map back to combobox model
+  // Revert menu offset to map back to combobox model.
   id -= kFirstMenuItemId;
   DCHECK_LT(id, combobox_->model()->GetItemCount());
-  selected_item_ = id;
+  selected_index_ = id;
   combobox_->SelectionChanged();
   SchedulePaint();
 }
 
 bool NativeComboboxViews::GetAccelerator(int id, ui::Accelerator* accel) {
   return false;
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeComboboxViews private methods:
 
 void NativeComboboxViews::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
   rect->set_x(GetMirroredXForRect(*rect));
 }
 
 void NativeComboboxViews::PaintText(gfx::Canvas* canvas) {
   gfx::Insets insets = GetInsets();
 
   canvas->Save();
   canvas->ClipRect(GetContentsBounds());
 
   int x = insets.left();
   int y = insets.top();
   int text_height = height() - insets.height();
   SkColor text_color = kTextColor;
 
-  int index = GetSelectedItem();
+  int index = GetSelectedIndex();
   if (index < 0 || index > combobox_->model()->GetItemCount())
     index = 0;
   string16 text = combobox_->model()->GetItemAt(index);
 
   int disclosure_arrow_offset = width() - disclosure_arrow_->width()
       - kDisclosureArrowLeftPadding - kDisclosureArrowRightPadding;
 
   const gfx::Font& font = Combobox::GetFont();
   int text_width = font.GetStringWidth(text);
   if ((text_width + insets.width()) > disclosure_arrow_offset)
@@ skipping 54 matching lines @@
 
 #if defined(USE_AURA)
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   return new NativeComboboxViews(combobox);
 }
 #endif
 
 }  // namespace views