ui/views/controls/combobox/native_combobox_win.cc - Issue 10084020: Removing defunct code around PureViews.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: ui/views/controls/combobox/native_combobox_win.cc

diff --git a/ui/views/controls/combobox/native_combobox_win.cc b/ui/views/controls/combobox/native_combobox_win.cc

index 59b66b1ec92a40ba4257979e576a1cb6981c0633..fbf7adf6471fba2fdb542e8394e71a83585a116a 100644

--- a/ui/views/controls/combobox/native_combobox_win.cc

+++ b/ui/views/controls/combobox/native_combobox_win.cc

@@ -207,9 +207,11 @@ void NativeComboboxWin::UpdateFont() {

// static

NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(

Combobox* combobox) {

- if (Widget::IsPureViews())

- return new NativeComboboxViews(combobox);

+#if defined(USE_AURA)

+ return new NativeComboboxViews(combobox);

+#else

return new NativeComboboxWin(combobox);

+#endif

}

} // namespace views