1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/ui/views/examples/example_combobox_model.h b/chromium/ui/views/examples/example_combobox_model.h
index 74262d8b90f..3b233323ef5 100644
--- a/chromium/ui/views/examples/example_combobox_model.h
+++ b/chromium/ui/views/examples/example_combobox_model.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
 #define UI_VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/base/models/combobox_model.h"
 
 namespace views {
@@ -17,9 +16,9 @@ class ExampleComboboxModel : public ui::ComboboxModel {
   ExampleComboboxModel(const char** strings, int count);
   virtual ~ExampleComboboxModel();
 
-  // 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:
   const char** strings_;