1 files changed, 9 insertions, 9 deletions
diff --git a/chromium/ui/views/examples/combobox_example.h b/chromium/ui/views/examples/combobox_example.h
index 263782d54e3..89ccff2e986 100644
--- a/chromium/ui/views/examples/combobox_example.h
+++ b/chromium/ui/views/examples/combobox_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/examples/example_base.h"
@@ -15,30 +14,31 @@ namespace views {
 namespace examples {
 
 // A combobox model implementation that generates a list of "Item <index>".
-class ComboboxModelExample : public ui::ComboboxModel {
+class VIEWS_EXAMPLES_EXPORT ComboboxModelExample : public ui::ComboboxModel {
  public:
   ComboboxModelExample();
   virtual ~ComboboxModelExample();
 
-  // Overridden from ui::ComboboxModel:
+  // ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
-  virtual string16 GetItemAt(int index) OVERRIDE;
+  virtual base::string16 GetItemAt(int index) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ComboboxModelExample);
 };
 
-class ComboboxExample : public ExampleBase, public ComboboxListener {
+class VIEWS_EXAMPLES_EXPORT ComboboxExample : public ExampleBase,
+                                              public ComboboxListener {
  public:
   ComboboxExample();
   virtual ~ComboboxExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
-  // Overridden from ComboboxListener:
-  virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE;
+  // ComboboxListener:
+  virtual void OnPerformAction(Combobox* combobox) OVERRIDE;
 
   ComboboxModelExample combobox_model_;
   Combobox* combobox_;