Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: ui/views/controls/combobox/native_combobox_win.cc

Issue 12217151: Use NativeComboboxViews instead of NativeComboboxWin on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Enable NativeComboboxViewsTest on non-Aura Win. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/views/views.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/controls/combobox/native_combobox_win.h" 5 #include "ui/views/controls/combobox/native_combobox_win.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "ui/base/events/event.h" 9 #include "ui/base/events/event.h"
10 #include "ui/base/models/combobox_model.h" 10 #include "ui/base/models/combobox_model.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 HFONT font = Combobox::GetFont().GetNativeFont(); 201 HFONT font = Combobox::GetFont().GetNativeFont();
202 SendMessage(native_view(), WM_SETFONT, reinterpret_cast<WPARAM>(font), FALSE); 202 SendMessage(native_view(), WM_SETFONT, reinterpret_cast<WPARAM>(font), FALSE);
203 } 203 }
204 204
205 //////////////////////////////////////////////////////////////////////////////// 205 ////////////////////////////////////////////////////////////////////////////////
206 // NativeComboboxWrapper, public: 206 // NativeComboboxWrapper, public:
207 207
208 // static 208 // static
209 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper( 209 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
210 Combobox* combobox) { 210 Combobox* combobox) {
211 #if defined(USE_AURA)
212 return new NativeComboboxViews(combobox); 211 return new NativeComboboxViews(combobox);
213 #else
214 return new NativeComboboxWin(combobox);
215 #endif
216 } 212 }
217 213
218 } // namespace views 214 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698