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

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

Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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 | « views/controls/button/text_button.cc ('k') | views/controls/label.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "views/controls/combobox/native_combobox_win.h" 5 #include "views/controls/combobox/native_combobox_win.h"
6 6
7 #include "app/combobox_model.h" 7 #include "app/combobox_model.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "gfx/font.h" 10 #include "gfx/font.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 UpdateFont(); 175 UpdateFont();
176 UpdateFromModel(); 176 UpdateFromModel();
177 UpdateSelectedItem(); 177 UpdateSelectedItem();
178 } 178 }
179 179
180 //////////////////////////////////////////////////////////////////////////////// 180 ////////////////////////////////////////////////////////////////////////////////
181 // NativeComboboxWin, private: 181 // NativeComboboxWin, private:
182 182
183 void NativeComboboxWin::UpdateFont() { 183 void NativeComboboxWin::UpdateFont() {
184 HFONT font = ResourceBundle::GetSharedInstance(). 184 HFONT font = ResourceBundle::GetSharedInstance().
185 GetFont(ResourceBundle::BaseFont).hfont(); 185 GetFont(ResourceBundle::BaseFont).GetNativeFont();
186 SendMessage(native_view(), WM_SETFONT, reinterpret_cast<WPARAM>(font), FALSE); 186 SendMessage(native_view(), WM_SETFONT, reinterpret_cast<WPARAM>(font), FALSE);
187 } 187 }
188 188
189 //////////////////////////////////////////////////////////////////////////////// 189 ////////////////////////////////////////////////////////////////////////////////
190 // NativeComboboxWrapper, public: 190 // NativeComboboxWrapper, public:
191 191
192 // static 192 // static
193 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper( 193 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
194 Combobox* combobox) { 194 Combobox* combobox) {
195 return new NativeComboboxWin(combobox); 195 return new NativeComboboxWin(combobox);
196 } 196 }
197 197
198 } // namespace views 198 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/button/text_button.cc ('k') | views/controls/label.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698