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

Side by Side Diff: ui/views/controls/textfield/native_textfield_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/textfield/native_textfield_win.h" 5 #include "ui/views/controls/textfield/native_textfield_win.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/i18n/case_conversion.h" 9 #include "base/i18n/case_conversion.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after
1157 IDS_APP_SELECT_ALL); 1157 IDS_APP_SELECT_ALL);
1158 context_menu_.reset(new Menu2(context_menu_contents_.get())); 1158 context_menu_.reset(new Menu2(context_menu_contents_.get()));
1159 } 1159 }
1160 1160
1161 //////////////////////////////////////////////////////////////////////////////// 1161 ////////////////////////////////////////////////////////////////////////////////
1162 // NativeTextfieldWrapper, public: 1162 // NativeTextfieldWrapper, public:
1163 1163
1164 // static 1164 // static
1165 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper( 1165 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
1166 Textfield* field) { 1166 Textfield* field) {
1167 if (views::Widget::IsPureViews()) 1167 #if defined(USE_AURA)
1168 return new NativeTextfieldViews(field); 1168 return new NativeTextfieldViews(field);
1169 #else
1169 return new NativeTextfieldWin(field); 1170 return new NativeTextfieldWin(field);
1171 #endif
1170 } 1172 }
1171 1173
1172 } // namespace views 1174 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/textfield/native_textfield_views_unittest.cc ('k') | ui/views/controls/textfield/textfield.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698