Combobox: Rename styles to STYLE_NORMAL and STYLE_ACTION and modify behaviors

ui/views/examples/text_example.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_EXAMPLES_TEXT_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/views/controls/button/button.h"
@@ skipping 25 matching lines @@
   // Creates and adds a combobox to the layout.
   Combobox* AddCombobox(GridLayout* layout,
                         const char* name,
                         const char** strings,
                         int count);
 
   // ButtonListener:
   virtual void ButtonPressed(Button* button, const ui::Event& event) OVERRIDE;
 
   // ComboboxListener:
-  virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE;
+  virtual void OnPerformAction(Combobox* combobox) OVERRIDE;
 
   class TextExampleView;
   // The content of the scroll view.
   TextExampleView* text_view_;
 
   // Combo box for horizontal text alignment.
   Combobox* h_align_cb_;
 
   // Combo box for text eliding style.
   Combobox* eliding_cb_;
@@ skipping 26 matching lines @@
   // around until destruction time.
   ScopedVector<ExampleComboboxModel> example_combobox_model_;
 
   DISALLOW_COPY_AND_ASSIGN(TextExample);
 };
 
 }  // namespace examples
 }  // namespace views
 
 #endif  // UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_