diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 00:54:43 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 00:54:43 +0000 |
| commit | 89988c3da97b719bcb566b7e4f808ba1a87b8644 (patch) | |
| tree | 77b42a8f8e9b85d0e281f8a5f001004207a8555e /ui | |
| parent | 31882285ebfac4fadca06f2f0c0ea58475c7f426 (diff) | |
| download | chromium_src-89988c3da97b719bcb566b7e4f808ba1a87b8644.zip chromium_src-89988c3da97b719bcb566b7e4f808ba1a87b8644.tar.gz chromium_src-89988c3da97b719bcb566b7e4f808ba1a87b8644.tar.bz2 | |
Use NativeComboboxViews instead of NativeComboboxWin on Windows.
Always use NativeComboBoxViews on non-Aura Win.
Enable NativeComboBoxViewsTest on non-Aura Win.
Both of these are already used on CrOS and Win Aura.
See non-Aura Win differences at http://crbug.com/175843#c1
TODO(followup): Tweak behavior/appearance of Views impl.
TODO(followup): Nix [Win|Wrapper], flatten Views->ComboBox.
BUG=175843
TEST=Windows combo-boxes look and behave different, but sane.
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12217151
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/controls/combobox/native_combobox_win.cc | 4 | ||||
| -rw-r--r-- | ui/views/views.gyp | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/ui/views/controls/combobox/native_combobox_win.cc b/ui/views/controls/combobox/native_combobox_win.cc index 35cb649..4a48965 100644 --- a/ui/views/controls/combobox/native_combobox_win.cc +++ b/ui/views/controls/combobox/native_combobox_win.cc @@ -208,11 +208,7 @@ void NativeComboboxWin::UpdateFont() { // static NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper( Combobox* combobox) { -#if defined(USE_AURA) return new NativeComboboxViews(combobox); -#else - return new NativeComboboxWin(combobox); -#endif } } // namespace views diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 44e3b42..abd8943 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -689,11 +689,6 @@ '../../base/allocator/allocator.gyp:allocator', ], }], - ['use_aura==0 and OS=="win"', { - 'sources/': [ - ['exclude', 'controls/combobox/native_combobox_views_unittest.cc'], - ], - }], [ 'use_aura==1', { 'dependencies': [ '../aura/aura.gyp:aura_test_support', |