views: Fix a couple of trivial TODOS.

views/controls/combobox/native_combobox_gtk.cc

 // Copyright (c) 2011 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.
 
 #include "views/controls/combobox/native_combobox_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/combobox/native_combobox_views.h"
 #include "views/views_delegate.h"
 #include "views/widget/widget.h"
 
-using ui::ComboboxModel;  // TODO(beng): remove
-
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxGtk, public:
 
 NativeComboboxGtk::NativeComboboxGtk(Combobox* combobox)
     : combobox_(combobox),
       menu_(NULL) {
   set_focus_view(combobox);
 }
 
 NativeComboboxGtk::~NativeComboboxGtk() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxGtk, NativeComboboxWrapper implementation:
 
 void NativeComboboxGtk::UpdateFromModel() {
   if (!native_view())
     return;
 
   preferred_size_ = gfx::Size();
 
   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;
   while (count-- > 0) {
     gtk_list_store_prepend(store, &iter);
     gtk_list_store_set(store, &iter,
                        0, UTF16ToUTF8(model->GetItemAt(count)).c_str(),
                        -1);
   }
 }
@@ skipping 169 matching lines @@
 
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   if (Widget::IsPureViews())
     return new NativeComboboxViews(combobox);
   return new NativeComboboxGtk(combobox);
 }
 
 }  // namespace views