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..1e0082d4eb4d498be7328aafcd55034ba5d6656b 100644
--- a/ui/views/controls/combobox/combobox.h
+++ b/ui/views/controls/combobox/combobox.h
@@ -65,6 +65,8 @@ class VIEWS_EXPORT Combobox : public MenuDelegate,
 
   void SetStyle(Style style);
 
+  void SetMenuItemRaisesClickEvent(bool value);
+
   // Informs the combobox that its model changed.
   void ModelChanged();
 
@@ -158,6 +160,10 @@ class VIEWS_EXPORT Combobox : public MenuDelegate,
   // The visual style of this combobox.
   Style style_;
 
+  // Whether clicking a menu item raises a click event. When |style_| is not
+  // STYLE_NOTIFY_ON_CLICK, this is ignored.

[sky, 2014/01/17 16:01:55]

AFAIK you are the only using STYLE_NOTIFY_ON_CLICK, so make the behavior you
want the default.

[hajimehoshi, 2014/01/20 03:06:14]

Done.

+  bool menu_item_raises_click_event_;
+
   // Our listener. Not owned. Notified when the selected index change.
   ComboboxListener* listener_;