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

ui/views/controls/combobox/native_combobox_views.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_VIEWS_H_
 #define UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_VIEWS_H_
 #pragma once
 
 #include "ui/views/controls/combobox/native_combobox_wrapper.h"
 #include "ui/views/controls/menu/menu_delegate.h"
@@ skipping 10 matching lines @@
 class MenuRunner;
 
 // A views/skia only implementation of NativeComboboxWrapper.
 // No platform specific code is used.
 class NativeComboboxViews : public views::View,
                             public NativeComboboxWrapper,
                             public views::MenuDelegate {
  public:
   static const char kViewClassName[];
 
-  explicit NativeComboboxViews(Combobox* parent);
+  explicit NativeComboboxViews(Combobox* combo_box);
   virtual ~NativeComboboxViews();
 
   // views::View overrides:
   virtual bool OnMousePressed(const views::MouseEvent& mouse_event) OVERRIDE;
   virtual bool OnMouseDragged(const views::MouseEvent& mouse_event) OVERRIDE;
   virtual bool OnKeyPressed(const views::KeyEvent& key_event) OVERRIDE;
   virtual bool OnKeyReleased(const views::KeyEvent& key_event) OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
 
   // NativeComboboxWrapper overrides:
   virtual void UpdateFromModel() OVERRIDE;
-  virtual void UpdateSelectedItem() OVERRIDE;
+  virtual void UpdateSelectedIndex() OVERRIDE;
   virtual void UpdateEnabled() OVERRIDE;
-  virtual int GetSelectedItem() const OVERRIDE;
+  virtual int GetSelectedIndex() const OVERRIDE;
   virtual bool IsDropdownOpen() const OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual View* GetView() OVERRIDE;
   virtual void SetFocus() OVERRIDE;
   virtual bool HandleKeyPressed(const views::KeyEvent& event) OVERRIDE;
   virtual bool HandleKeyReleased(const views::KeyEvent& event) OVERRIDE;
   virtual void HandleFocus() OVERRIDE;
   virtual void HandleBlur() OVERRIDE;
   virtual gfx::NativeView GetTestingHandle() const OVERRIDE;
 
@@ skipping 22 matching lines @@
 
   // The disclosure arrow next to the currently selected item from the list.
   const SkBitmap* disclosure_arrow_;
 
   // Responsible for showing the context menu.
   scoped_ptr<MenuRunner> dropdown_list_menu_runner_;
 
   // Is the drop down list showing
   bool dropdown_open_;
 
-  // Index in the model of the selected item: -1 => none
-  int selected_item_;
+  // The selected index in the model. The default value is -1, which means no
+  // selection.
+  int selected_index_;
 
   // The maximum dimensions of the content in the dropdown
   int content_width_;
   int content_height_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeComboboxViews);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_VIEWS_H_