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/focus | |
| 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/focus')
| -rw-r--r-- | views/focus/focus_manager_unittest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc index 716f4d1..2277964 100644 --- a/views/focus/focus_manager_unittest.cc +++ b/views/focus/focus_manager_unittest.cc @@ -4,7 +4,6 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "app/combobox_model.h" #include "base/logging.h" #include "base/string16.h" #include "base/string_number_conversions.h" @@ -12,6 +11,7 @@ #include "gfx/rect.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/models/combobox_model.h" #include "views/background.h" #include "views/border.h" #include "views/controls/button/checkbox.h" @@ -40,6 +40,8 @@ #include "views/window/window_gtk.h" #endif +using ui::ComboboxModel; // TODO(beng): remove + namespace { const int kWindowWidth = 600; const int kWindowHeight = 500; |