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

Unified Diff: ui/views/widget/widget.cc

Issue 10827454: Move more methods from NWW to HWNDMessageHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/native_widget_win.cc ('k') | ui/views/win/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget.cc
===================================================================
--- ui/views/widget/widget.cc (revision 152769)
+++ ui/views/widget/widget.cc (working copy)
@@ -658,8 +658,11 @@
InputMethod* Widget::GetInputMethod() {
if (is_top_level()) {
- if (!input_method_.get())
+ if (!input_method_.get()) {
input_method_.reset(native_widget_->CreateInputMethod());
+ if (input_method_.get())
+ input_method_->Init(this);
+ }
return input_method_.get();
} else {
Widget* toplevel = GetTopLevelWidget();
@@ -1320,7 +1323,7 @@
void Widget::ReplaceInputMethod(InputMethod* input_method) {
input_method_.reset(input_method);
- input_method->set_delegate(native_widget_);
+ input_method->set_delegate(native_widget_->GetInputMethodDelegate());
input_method->Init(this);
}
« no previous file with comments | « ui/views/widget/native_widget_win.cc ('k') | ui/views/win/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698