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

Unified Diff: ui/views/widget/native_widget_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/views.gyp ('k') | ui/views/widget/widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_win.cc
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc
index fc85a882cbd23d5836511081efac7a4f0bc63539..513b7fb999d5991685a23efd328673bfcd14e35c 100644
--- a/ui/views/widget/native_widget_win.cc
+++ b/ui/views/widget/native_widget_win.cc
@@ -660,12 +660,13 @@ bool NativeWidgetWin::HasCapture(unsigned int flags) const {
}
InputMethod* NativeWidgetWin::CreateInputMethod() {
- if (views::Widget::IsPureViews()) {
- InputMethod* input_method = new InputMethodWin(this);
- input_method->Init(GetWidget());
- return input_method;
- }
+#if defined(USE_AURA)
+ InputMethod* input_method = new InputMethodWin(this);
+ input_method->Init(GetWidget());
+ return input_method;
+#else
return NULL;
+#endif
}
void NativeWidgetWin::CenterWindow(const gfx::Size& size) {
« no previous file with comments | « ui/views/views.gyp ('k') | ui/views/widget/widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698