Combobox: Rename styles to STYLE_NORMAL and STYLE_ACTION and modify behaviors

ui/views/controls/combobox/combobox.h

Index: ui/views/controls/combobox/combobox.h
diff --git a/ui/views/controls/combobox/combobox.h b/ui/views/controls/combobox/combobox.h
index 20b65e0a4c06b9a9ca095aef60c123bfdd2acab2..e22edda0028bc6e0618d359bb024070bd5a89a03 100644
--- a/ui/views/controls/combobox/combobox.h
+++ b/ui/views/controls/combobox/combobox.h
@@ -39,7 +39,8 @@ class PrefixSelector;
 // Combobox has two distinct parts, the drop down arrow and the text. When the
 // 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).
+// (STYLE_NOTIFY_ON_CLICK). When using STYLE_NOTIFY_ON_CLICK, the listener is

[sky, 2014/01/22 16:04:07]

Sorry, this comment doesn't really help. Nuke it.

+// notified even when the user clicks a menu item.
 class VIEWS_EXPORT Combobox : public MenuDelegate,
                               public PrefixDelegate,
                               public ui::ComboboxModelObserver,
@@ -121,6 +122,7 @@ class VIEWS_EXPORT Combobox : public MenuDelegate,
  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();