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

ui/views/examples/native_theme_button_example.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/examples/native_theme_button_example.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
@@ skipping 80 matching lines @@
   return base::StringPrintf(message, ++count_);
 }
 
 void ExampleNativeThemeButton::ItemChanged(Combobox* combo_box,
                                            int prev_index,
                                            int new_index) {
   SchedulePaint();
 }
 
 gfx::NativeTheme::Part ExampleNativeThemeButton::GetThemePart() const {
-  int selected = cb_part_->selected_item();
-  switch (selected) {
+  switch (cb_part_->selected_index()) {
     case 0:
       return gfx::NativeTheme::kPushButton;
     case 1:
       return gfx::NativeTheme::kRadio;
     case 2:
       return gfx::NativeTheme::kCheckbox;
     default:
       DCHECK(false);
   }
   return gfx::NativeTheme::kPushButton;
 }
 
 gfx::Rect ExampleNativeThemeButton::GetThemePaintRect() const {
   gfx::NativeTheme::ExtraParams extra;
   gfx::NativeTheme::State state = GetThemeState(&extra);
   gfx::Size size(gfx::NativeTheme::instance()->GetPartSize(GetThemePart(),
                                                            state,
                                                            extra));
   gfx::Rect rect(size);
   rect.set_x(GetMirroredXForRect(rect));
   return rect;
 }
 
 gfx::NativeTheme::State ExampleNativeThemeButton::GetThemeState(
     gfx::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
 
-  int selected = cb_state_->selected_item();
+  int selected = cb_state_->selected_index();
   if (selected > 3) {
     switch (state()) {
       case BS_DISABLED:
         return gfx::NativeTheme::kDisabled;
       case BS_NORMAL:
         return gfx::NativeTheme::kNormal;
       case BS_HOT:
         return gfx::NativeTheme::kHovered;
       case BS_PUSHED:
         return gfx::NativeTheme::kPressed;
@@ skipping 22 matching lines @@
 
   params->button.checked = is_checked_;
   params->button.indeterminate = is_indeterminate_;
   params->button.is_default = false;
   params->button.has_border = false;
   params->button.classic_state = 0;
   params->button.background_color = SkColorSetARGB(0, 0, 0, 0);
 }
 
 const ui::Animation* ExampleNativeThemeButton::GetThemeAnimation() const {
-  int selected = cb_state_->selected_item();
-  return selected <= 3 ? NULL : hover_animation_.get();
+  return cb_state_->selected_index() <= 3 ? NULL : hover_animation_.get();
 }
 
 gfx::NativeTheme::State ExampleNativeThemeButton::GetBackgroundThemeState(
     gfx::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   return gfx::NativeTheme::kNormal;
 }
 
 gfx::NativeTheme::State ExampleNativeThemeButton::GetForegroundThemeState(
     gfx::NativeTheme::ExtraParams* params) const {
@@ skipping 32 matching lines @@
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL,
                         0.1f, GridLayout::USE_PREF, 0, 0);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL,
                         0.9f, GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, 8);
 
   layout->StartRow(0, 0);
   layout->AddView(new Label(ASCIIToUTF16("Part:")));
   Combobox* cb_part = new Combobox(
       new ExampleComboboxModel(kParts, arraysize(kParts)));
-  cb_part->SetSelectedItem(0);
+  cb_part->SetSelectedIndex(0);
   layout->AddView(cb_part);
 
   layout->StartRow(0, 0);
   layout->AddView(new Label(ASCIIToUTF16("State:")));
   Combobox* cb_state = new Combobox(
       new ExampleComboboxModel(kStates, arraysize(kStates)));
-  cb_state->SetSelectedItem(0);
+  cb_state->SetSelectedIndex(0);
   layout->AddView(cb_state);
 
   layout->AddPaddingRow(0, 32);
 
   button_ = new ExampleNativeThemeButton(this, cb_part, cb_state);
 
   column_set = layout->AddColumnSet(1);
   column_set->AddPaddingColumn(0, 16);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL,
                         1, GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, 16);
   layout->StartRow(1, 1);
   layout->AddView(button_);
 
   layout->AddPaddingRow(0, 8);
 }
 
 void NativeThemeButtonExample::ButtonPressed(Button* sender,
                                              const Event& event) {
   PrintStatus(button_->MessWithState().c_str());
 }
 
 }  // namespace examples
 }  // namespace views