summaryrefslogtreecommitdiffstats
path: root/views/controls/combobox/combobox.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 15:49:40 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 15:49:40 +0000
commit44cbd9e3734527f73a83f8a864be0bb5ccae0a7a (patch)
treea997fb0565558d63e0eab62b631ef984de3e9596 /views/controls/combobox/combobox.cc
parent0c1c047d641a599ffffa280ab50d564cedb3e436 (diff)
downloadchromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.zip
chromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.tar.gz
chromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.tar.bz2
Move models from app to ui/base/models
BUG=none TEST=none TBR=brettw git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/combobox/combobox.cc')
-rw-r--r--views/controls/combobox/combobox.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc
index 49dd4d3..6eb32ba 100644
--- a/views/controls/combobox/combobox.cc
+++ b/views/controls/combobox/combobox.cc
@@ -4,13 +4,15 @@
#include "views/controls/combobox/combobox.h"
-#include "app/combobox_model.h"
#include "base/logging.h"
#include "base/utf_string_conversions.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"
+using ui::ComboboxModel; // TODO(beng): remove
+
namespace views {
// static