diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 15:49:40 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 15:49:40 +0000 |
| commit | 44cbd9e3734527f73a83f8a864be0bb5ccae0a7a (patch) | |
| tree | a997fb0565558d63e0eab62b631ef984de3e9596 /views/controls/combobox | |
| parent | 0c1c047d641a599ffffa280ab50d564cedb3e436 (diff) | |
| download | chromium_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')
| -rw-r--r-- | views/controls/combobox/combobox.cc | 4 | ||||
| -rw-r--r-- | views/controls/combobox/combobox.h | 3 | ||||
| -rw-r--r-- | views/controls/combobox/native_combobox_gtk.cc | 4 | ||||
| -rw-r--r-- | views/controls/combobox/native_combobox_win.cc | 4 |
4 files changed, 12 insertions, 3 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 diff --git a/views/controls/combobox/combobox.h b/views/controls/combobox/combobox.h index 2068932..d306761 100644 --- a/views/controls/combobox/combobox.h +++ b/views/controls/combobox/combobox.h @@ -10,7 +10,10 @@ #include "views/view.h" +namespace ui { class ComboboxModel; +} +using ui::ComboboxModel; namespace views { diff --git a/views/controls/combobox/native_combobox_gtk.cc b/views/controls/combobox/native_combobox_gtk.cc index 59eed68..e596328 100644 --- a/views/controls/combobox/native_combobox_gtk.cc +++ b/views/controls/combobox/native_combobox_gtk.cc @@ -8,10 +8,12 @@ #include <algorithm> -#include "app/combobox_model.h" #include "base/utf_string_conversions.h" +#include "ui/base/models/combobox_model.h" #include "views/controls/combobox/combobox.h" +using ui::ComboboxModel; // TODO(beng): remove + namespace views { //////////////////////////////////////////////////////////////////////////////// diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc index 2134a75e..94c431d 100644 --- a/views/controls/combobox/native_combobox_win.cc +++ b/views/controls/combobox/native_combobox_win.cc @@ -4,15 +4,17 @@ #include "views/controls/combobox/native_combobox_win.h" -#include "app/combobox_model.h" #include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "gfx/font.h" #include "gfx/native_theme_win.h" +#include "ui/base/models/combobox_model.h" #include "views/controls/combobox/combobox.h" #include "views/widget/widget.h" +using ui::ComboboxModel; // TODO(beng): remove + namespace views { // Limit how small a combobox can be. |