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

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

Issue 10084020: Removing defunct code around PureViews. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge tests. Created 8 years, 8 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
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/models/combobox_model.h" 9 #include "ui/base/models/combobox_model.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 HFONT font = Combobox::GetFont().GetNativeFont(); 200 HFONT font = Combobox::GetFont().GetNativeFont();
201 SendMessage(native_view(), WM_SETFONT, reinterpret_cast<WPARAM>(font), FALSE); 201 SendMessage(native_view(), WM_SETFONT, reinterpret_cast<WPARAM>(font), FALSE);
202 } 202 }
203 203
204 //////////////////////////////////////////////////////////////////////////////// 204 ////////////////////////////////////////////////////////////////////////////////
205 // NativeComboboxWrapper, public: 205 // NativeComboboxWrapper, public:
206 206
207 // static 207 // static
208 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper( 208 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
209 Combobox* combobox) { 209 Combobox* combobox) {
210 if (Widget::IsPureViews()) 210 #if defined(USE_AURA)
211 return new NativeComboboxViews(combobox); 211 return new NativeComboboxViews(combobox);
212 #else
212 return new NativeComboboxWin(combobox); 213 return new NativeComboboxWin(combobox);
214 #endif
213 } 215 }
214 216
215 } // namespace views 217 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/combobox/native_combobox_views_unittest.cc ('k') | ui/views/controls/scrollbar/scrollbar_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698