diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 17:57:22 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 17:57:22 +0000 |
| commit | 5fccc4b549c5bdc2f886701badbd10cf0728cfa7 (patch) | |
| tree | 1d497be9cb5e3303ea23e14291213fd010ee7ce1 | |
| parent | 623cf237bdec149da1c23514c09a397d995cbe38 (diff) | |
| download | chromium_src-5fccc4b549c5bdc2f886701badbd10cf0728cfa7.zip chromium_src-5fccc4b549c5bdc2f886701badbd10cf0728cfa7.tar.gz chromium_src-5fccc4b549c5bdc2f886701badbd10cf0728cfa7.tar.bz2 | |
Revert 182358 "Use NativeComboboxViews instead of NativeCombobox..."
> 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
BUG=175843,243386,244093
TBR=msw@chromium.org
Review URL: https://codereview.chromium.org/16358012
git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204000 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/views/controls/combobox/native_combobox_win.cc | 4 | ||||
| -rw-r--r-- | ui/views/views.gyp | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ui/views/controls/combobox/native_combobox_win.cc b/ui/views/controls/combobox/native_combobox_win.cc index 4424285..8b01256 100644 --- a/ui/views/controls/combobox/native_combobox_win.cc +++ b/ui/views/controls/combobox/native_combobox_win.cc @@ -212,7 +212,11 @@ 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 f79cb1d..f37dd11 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -752,6 +752,11 @@ '../../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', |