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 21 matching lines @@
 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
 // 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,
                               public ButtonListener {
  public:
   // The style of the combobox.
   enum Style {
     STYLE_SHOW_DROP_DOWN_ON_CLICK,
     STYLE_NOTIFY_ON_CLICK,
   };
@@ skipping 61 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_