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 47 matching lines @@
   explicit Combobox(ui::ComboboxModel* model);
   virtual ~Combobox();
 
   static const gfx::FontList& GetFontList();
 
   // Sets the listener which will be called when a selection has been made.
   void set_listener(ComboboxListener* listener) { listener_ = listener; }
 
   void SetStyle(Style style);
 
+  void SetMenuItemRaisesClickEvent(bool value);
+
   // Informs the combobox that its model changed.
   void ModelChanged();
 
   // Gets/Sets the selected index.
   int selected_index() const { return selected_index_; }
   void SetSelectedIndex(int index);
 
   // Looks for the first occurrence of |value| in |model()|. If found, selects
   // the found index and returns true. Otherwise simply noops and returns false.
   bool SelectValue(const base::string16& value);
@@ skipping 73 matching lines @@
 
   // Handles the clicking event.
   void HandleClickEvent();
 
   // Our model. Not owned.
   ui::ComboboxModel* model_;
 
   // 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_;
 
   // The current selected index; -1 and means no selection.
   int selected_index_;
 
   // True when the selection is visually denoted as invalid.
   bool invalid_;
 
   // The accessible name of this combobox.
@@ skipping 37 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_