6 files changed, 8 insertions, 16 deletions
diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc
index 4b67fe2..4507366 100644
--- a/chrome/browser/ui/views/cookie_info_view.cc
+++ b/chrome/browser/ui/views/cookie_info_view.cc
@@ -147,7 +147,7 @@ void CookieInfoView::ItemChanged(views::Combobox* combo_box,
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// CookieInfoView, ComboboxModel overrides.
+// CookieInfoView, ui::ComboboxModel overrides.
 int CookieInfoView::GetItemCount() {
   return static_cast<int>(expire_combo_values_.size());
 }
diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc
index 6e296d9..0f8ee2b 100644
--- a/views/controls/combobox/combobox.cc
+++ b/views/controls/combobox/combobox.cc
@@ -9,12 +9,9 @@
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
-#include "views/controls/combobox/native_combobox_wrapper.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/widget/widget.h"
 
-using ui::ComboboxModel;  // TODO(beng): remove
-
 namespace views {
 
 // static
@@ -23,7 +20,7 @@ const char Combobox::kViewClassName[] = "views/Combobox";
 ////////////////////////////////////////////////////////////////////////////////
 // Combobox, public:
 
-Combobox::Combobox(ComboboxModel* model)
+Combobox::Combobox(ui::ComboboxModel* model)
     : native_wrapper_(NULL),
       model_(model),
       listener_(NULL),
diff --git a/views/controls/combobox/combobox.h b/views/controls/combobox/combobox.h
index 2576fa3..1971f7f 100644
--- a/views/controls/combobox/combobox.h
+++ b/views/controls/combobox/combobox.h
@@ -15,7 +15,6 @@
 namespace ui {
 class ComboboxModel;
 }
-using ui::ComboboxModel;
 
 namespace views {
 
@@ -37,7 +36,7 @@ class VIEWS_EXPORT Combobox : public View {
   };
 
   // |model| is not owned by the combo box.
-  explicit Combobox(ComboboxModel* model);
+  explicit Combobox(ui::ComboboxModel* model);
   virtual ~Combobox();
 
   // Register |listener| for item change events.
@@ -56,7 +55,7 @@ class VIEWS_EXPORT Combobox : public View {
   void SelectionChanged();
 
   // Accessor for |model_|.
-  ComboboxModel* model() const { return model_; }
+  ui::ComboboxModel* model() const { return model_; }
 
   // Set the accessible name of the combo box.
   void SetAccessibleName(const string16& name);
@@ -92,7 +91,7 @@ class VIEWS_EXPORT Combobox : public View {
 
  private:
   // Our model.
-  ComboboxModel* model_;
+  ui::ComboboxModel* model_;
 
   // Item change listener.
   Listener* listener_;
diff --git a/views/controls/combobox/native_combobox_gtk.cc b/views/controls/combobox/native_combobox_gtk.cc
index baf03c4..76e550d 100644
--- a/views/controls/combobox/native_combobox_gtk.cc
+++ b/views/controls/combobox/native_combobox_gtk.cc
@@ -16,8 +16,6 @@
 #include "views/views_delegate.h"
 #include "views/widget/widget.h"
 
-using ui::ComboboxModel;  // TODO(beng): remove
-
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -43,7 +41,7 @@ void NativeComboboxGtk::UpdateFromModel() {
 
   GtkListStore* store =
       GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(native_view())));
-  ComboboxModel* model = combobox_->model();
+  ui::ComboboxModel* model = combobox_->model();
   int count = model->GetItemCount();
   gtk_list_store_clear(store);
   GtkTreeIter iter;
diff --git a/views/controls/combobox/native_combobox_views_unittest.cc b/views/controls/combobox/native_combobox_views_unittest.cc
index 979e0dd..61689d9 100644
--- a/views/controls/combobox/native_combobox_views_unittest.cc
+++ b/views/controls/combobox/native_combobox_views_unittest.cc
@@ -18,7 +18,7 @@ namespace {
 // OnKeyReleased() methods.
 class TestCombobox : public views::Combobox {
  public:
-  TestCombobox(ComboboxModel* model)
+  TestCombobox(ui::ComboboxModel* model)
       : Combobox(model),
         key_handled_(false),
         key_received_(false) {
@@ -142,7 +142,7 @@ class NativeComboboxViewsTest : public ViewsTestBase {
   NativeComboboxViews* combobox_view_;
 
   // Combobox does not take ownership of model_, which needs to be scoped.
-  scoped_ptr<ComboboxModel> model_;
+  scoped_ptr<ui::ComboboxModel> model_;
 
   // For testing input method related behaviors.
   MockInputMethod* input_method_;
diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc
index 1ccad96..e0fcff1 100644
--- a/views/controls/combobox/native_combobox_win.cc
+++ b/views/controls/combobox/native_combobox_win.cc
@@ -15,8 +15,6 @@
 #include "views/controls/combobox/native_combobox_views.h"
 #include "views/widget/widget.h"
 
-using ui::ComboboxModel;  // TODO(beng): remove
-
 namespace views {
 
 // Limit how small a combobox can be.