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 101 matching lines @@
   virtual void SetSelectedRow(int row) OVERRIDE;
   virtual base::string16 GetTextForRow(int row) OVERRIDE;
 
   // Overriden from ComboboxModelObserver:
   virtual void OnComboboxModelChanged(ui::ComboboxModel* model) OVERRIDE;
 
   // Overriden from ButtonListener:
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
 
  private:
+  // The sources of the clicking event of the text button.
+  enum ClickEventSource {
+    CLICK_EVENT_SOURCE_MENU_ITEM,
+    CLICK_EVENT_SOURCE_MOUSE,
+    CLICK_EVENT_SOURCE_KEYBOARD,
+  };
+
   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;
 
   // Draws the selected value of the drop down list
   void PaintText(gfx::Canvas* canvas);
 
   // Draws the button images.
   void PaintButtons(gfx::Canvas* canvas);
 
   // Show the drop down list
   void ShowDropDownMenu(ui::MenuSourceType source_type);
 
   // Called when the selection is changed by the user.
   void OnSelectionChanged();
 
   // Converts a menu command ID to a menu item index.
   int MenuCommandToIndex(int menu_command_id) const;
 
   int GetDisclosureArrowLeftPadding() const;
   int GetDisclosureArrowRightPadding() const;
 
   // Handles the clicking event.
-  void HandleClickEvent();
+  void HandleClickEvent(ClickEventSource source);
 
   // Our model. Not owned.
   ui::ComboboxModel* model_;
 
   // The visual style of this combobox.
   Style style_;
 
   // Our listener. Not owned. Notified when the selected index change.
   ComboboxListener* listener_;
 
@@ skipping 44 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_