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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "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"
11 #include "ui/base/win/hwnd_util.h" 11 #include "ui/base/win/hwnd_util.h"
12 #include "ui/gfx/font.h" 12 #include "ui/gfx/font.h"
13 #include "ui/gfx/native_theme_win.h" 13 #include "ui/gfx/native_theme_win.h"
14 #include "ui/views/widget/widget.h"
14 #include "views/controls/combobox/combobox.h" 15 #include "views/controls/combobox/combobox.h"
15 #include "views/controls/combobox/native_combobox_views.h" 16 #include "views/controls/combobox/native_combobox_views.h"
16 #include "views/widget/widget.h"
17 17
18 namespace views { 18 namespace views {
19 19
20 // Limit how small a combobox can be. 20 // Limit how small a combobox can be.
21 static const int kMinComboboxWidth = 148; 21 static const int kMinComboboxWidth = 148;
22 22
23 // Add a couple extra pixels to the widths of comboboxes and combobox 23 // Add a couple extra pixels to the widths of comboboxes and combobox
24 // dropdowns so that text isn't too crowded. 24 // dropdowns so that text isn't too crowded.
25 static const int kComboboxExtraPaddingX = 6; 25 static const int kComboboxExtraPaddingX = 6;
26 26
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 (Widget::IsPureViews())
211 return new NativeComboboxViews(combobox); 211 return new NativeComboboxViews(combobox);
212 return new NativeComboboxWin(combobox); 212 return new NativeComboboxWin(combobox);
213 } 213 }
214 214
215 } // namespace views 215 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/combobox/native_combobox_views_unittest.cc ('k') | views/controls/menu/menu_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698