Combobox: Rename styles to STYLE_NORMAL and STYLE_ACTION and modify behaviors

ui/views/controls/combobox/combobox.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_COMBOBOX_H_
 #define UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
 
 #include <string>
 
 #include "base/time/time.h"
@@ skipping 18 matching lines @@
 class ComboboxListener;
 class ComboboxMenuRunner;
 class CustomButton;
 class FocusableBorder;
 class MenuRunner;
 class MenuRunnerHandler;
 class Painter;
 class PrefixSelector;
 
 // A non-editable combobox (aka a drop-down list or selector).
 // Combobox has two distinct parts, the drop down arrow and the text. When the

[sky, 2014/01/24 17:05:39]

I think you've convinced me that for the style you care about, the selected
index should remain 0 always. So, go back to your earlier patch where you had
this logic and update this second sentence to something like: Combobox offers
two distinct behaviors:
. STYLE_NORMAL: typical combobox, clicking on the text and/or button shows the
drop down, arrow keys change selection, selected index can be changed by the
user to something other than the first item.
. STYLE_ACTION: clicking on the text notifies the listener. The menu can be
shown only by clicking on the arrow. The selected index is always reverted to 0
after the listener is notified.

I'm not too thrilled with STYLE_ACTION, but it's the best I can think of.

[hajimehoshi, 2014/01/24 18:07:09]

Patch #3: The selected index is not cared.
Patch #4: The first item is always rendered whichever the selected index is.
Before notifying the click event, the selected index is set to 0 if the event is
fired from a keyboard.
Patch #5: The selected index can be changed by selecting a menu item or calling
SetSelectedIndex from the consumer. The width is based on the selected index.
Keyboard events doesn't change the index.

Hmm, all of them doesn't seem to be the logic that the selected index remain 0
always. Anyway, I'll fix this patch to keep the selected index 0, basing on
patch #5. Thanks.

 // user clicks on the text the drop down is either shown
 // (STYLE_SHOW_DROP_DOWN_ON_CLICK) or the listener is notified
 // (STYLE_NOTIFY_ON_CLICK).
 class VIEWS_EXPORT Combobox : public MenuDelegate,
                               public PrefixDelegate,
                               public ui::ComboboxModelObserver,
                               public ButtonListener {
  public:
   // The style of the combobox.
   enum Style {
@@ skipping 64 matching lines @@
 
   // Overriden from ComboboxModelObserver:
   virtual void OnComboboxModelChanged(ui::ComboboxModel* model) OVERRIDE;
 
   // Overriden from ButtonListener:
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ComboboxTest, Click);
   FRIEND_TEST_ALL_PREFIXES(ComboboxTest, NotifyOnClickWithMouse);
+  FRIEND_TEST_ALL_PREFIXES(ComboboxTest, ContentWidth);
 
   // Updates the combobox's content from its model.
   void UpdateFromModel();
 
   // Updates the border according to the current state.
   void UpdateBorder();
 
   // Given bounds within our View, this helper mirrors the bounds if necessary.
   void AdjustBoundsForRTLUI(gfx::Rect* rect) const;
 
@@ skipping 74 matching lines @@
   // The base View takes the ownerships of these as child views.
   CustomButton* text_button_;
   CustomButton* arrow_button_;
 
   DISALLOW_COPY_AND_ASSIGN(Combobox);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_