Combobox: Rename styles to STYLE_NORMAL and STYLE_ACTION and modify behaviors

ui/views/controls/combobox/combobox_unittest.cc

Index: ui/views/controls/combobox/combobox_unittest.cc
diff --git a/ui/views/controls/combobox/combobox_unittest.cc b/ui/views/controls/combobox/combobox_unittest.cc
index 580b79f0245801a02b90f94d66efced477dc7ec6..f801b0a8dbe8e94e980834c20d18dcf4eef63c14 100644
--- a/ui/views/controls/combobox/combobox_unittest.cc
+++ b/ui/views/controls/combobox/combobox_unittest.cc
@@ -117,6 +117,29 @@ class TestComboboxModel : public ui::ComboboxModel {
   DISALLOW_COPY_AND_ASSIGN(TestComboboxModel);
 };
 
+// A combobox model which refers to a vector.
+class VectorComboboxModel : public ui::ComboboxModel {
+ public:
+  VectorComboboxModel(std::vector<std::string>* values)
+      : values_(values) {
+  }
+  virtual ~VectorComboboxModel() {}
+
+  // ui::ComboboxModel:
+  virtual int GetItemCount() const OVERRIDE {
+    return values_->size();
+  }
+  virtual base::string16 GetItemAt(int index) OVERRIDE {
+    return ASCIIToUTF16(values_->at(index));
+  }
+  virtual bool IsItemSeparatorAt(int index) OVERRIDE {
+    return false;
+  }
+
+ private:
+  std::vector<std::string>* values_;
+};
+
 class EvilListener : public ComboboxListener {
  public:
   EvilListener() : deleted_(false) {};
@@ -439,6 +462,28 @@ TEST_F(ComboboxTest, SelectValue) {
   EXPECT_EQ(1, combobox_->selected_index());
   EXPECT_FALSE(combobox_->SelectValue(ASCIIToUTF16("BANANAS")));
   EXPECT_EQ(1, combobox_->selected_index());
+
+  // With the action style, the selected index is always 0.
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
+  EXPECT_FALSE(combobox_->SelectValue(ASCIIToUTF16("PEANUT BUTTER")));
+  EXPECT_EQ(0, combobox_->selected_index());
+  EXPECT_FALSE(combobox_->SelectValue(ASCIIToUTF16("JELLY")));
+  EXPECT_EQ(0, combobox_->selected_index());
+  EXPECT_FALSE(combobox_->SelectValue(ASCIIToUTF16("BANANAS")));
+  EXPECT_EQ(0, combobox_->selected_index());
+}
+
+TEST_F(ComboboxTest, SelectIndexActionStyle) {
+  InitCombobox();
+
+  // With the action style, the selected index is always 0.
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
+  combobox_->SetSelectedIndex(1);
+  EXPECT_EQ(0, combobox_->selected_index());
+  combobox_->SetSelectedIndex(2);
+  EXPECT_EQ(0, combobox_->selected_index());
+  combobox_->SetSelectedIndex(3);
+  EXPECT_EQ(0, combobox_->selected_index());
 }
 
 TEST_F(ComboboxTest, ListenerHandlesDelete) {
@@ -476,12 +521,12 @@ TEST_F(ComboboxTest, NotifyOnClickWithReturnKey) {
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
-  // With STYLE_SHOW_DROP_DOWN_ON_CLICK, the click event is ignored.
+  // With STYLE_NORMAL, the click event is ignored.
   SendKeyEvent(ui::VKEY_RETURN);
   EXPECT_FALSE(listener.on_combobox_text_button_clicked_called());
 
-  // With STYLE_NOTIFY_ON_CLICK, the click event is notified.
-  combobox_->SetStyle(Combobox::STYLE_NOTIFY_ON_CLICK);
+  // With STYLE_ACTION, the click event is notified.
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
   SendKeyEvent(ui::VKEY_RETURN);
   EXPECT_TRUE(listener.on_combobox_text_button_clicked_called());
 }
@@ -492,14 +537,14 @@ TEST_F(ComboboxTest, NotifyOnClickWithSpaceKey) {
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
-  // With STYLE_SHOW_DROP_DOWN_ON_CLICK, the click event is ignored.
+  // With STYLE_NORMAL, the click event is ignored.
   SendKeyEvent(ui::VKEY_SPACE);
   EXPECT_FALSE(listener.on_combobox_text_button_clicked_called());
   SendKeyEventWithType(ui::VKEY_SPACE, ui::ET_KEY_RELEASED);
   EXPECT_FALSE(listener.on_combobox_text_button_clicked_called());
 
-  // With STYLE_NOTIFY_ON_CLICK, the click event is notified after releasing.
-  combobox_->SetStyle(Combobox::STYLE_NOTIFY_ON_CLICK);
+  // With STYLE_ACTION, the click event is notified after releasing.
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
   SendKeyEvent(ui::VKEY_SPACE);
   EXPECT_FALSE(listener.on_combobox_text_button_clicked_called());
   SendKeyEventWithType(ui::VKEY_SPACE, ui::ET_KEY_RELEASED);
@@ -512,7 +557,7 @@ TEST_F(ComboboxTest, NotifyOnClickWithMouse) {
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
-  combobox_->SetStyle(Combobox::STYLE_NOTIFY_ON_CLICK);
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
   combobox_->Layout();
 
   // Click the right side (arrow button). The menu is shown.
@@ -547,13 +592,48 @@ TEST_F(ComboboxTest, ConsumingPressKeyEvents) {
   EXPECT_FALSE(combobox_->OnKeyPressed(
       ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_SPACE, 0, false)));
 
-  // When the combobox's style is STYLE_NOTIFY_ON_CLICK, pressing events of
-  // a space key or an enter key will be consumed.
-  combobox_->SetStyle(Combobox::STYLE_NOTIFY_ON_CLICK);
+  // When the combobox's style is STYLE_ACTION, pressing events of a space key
+  // or an enter key will be consumed.
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
   EXPECT_TRUE(combobox_->OnKeyPressed(
       ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, 0, false)));
   EXPECT_TRUE(combobox_->OnKeyPressed(
       ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_SPACE, 0, false)));
 }
 
+TEST_F(ComboboxTest, ContentWidth) {
+  std::vector<std::string> values;
+
+  scoped_ptr<VectorComboboxModel> model(new VectorComboboxModel(&values));
+  combobox_ = new TestCombobox(model.get());
+
+  std::string long_item = "this is the long item";
+  std::string short_item = "s";
+
+  values.resize(1);
+  values[0] = long_item;
+  combobox_->ModelChanged();
+
+  const int long_item_width = combobox_->content_size_.width();
+
+  values[0] = short_item;
+  combobox_->ModelChanged();
+
+  const int short_item_width = combobox_->content_size_.width();
+
+  values.resize(2);
+  values[0] = short_item;
+  values[1] = long_item;
+  combobox_->ModelChanged();
+
+  // When the style is STYLE_NORMAL, the width will fit with the longest item.
+  combobox_->SetStyle(Combobox::STYLE_NORMAL);
+  EXPECT_EQ(long_item_width, combobox_->content_size_.width());
+
+  // When the style is STYLE_ACTION, the width will fit with the first items'
+  // width.
+  combobox_->SetStyle(Combobox::STYLE_ACTION);
+  EXPECT_EQ(short_item_width, combobox_->content_size_.width());
+}
+
 }  // namespace views