Index: ui/views/controls/combobox/combobox.cc |
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc |
index e1c7586f2de4cbf49502916bd876eecbb9099ab5..6d76de84d1d816eb763a22e3e6ff78145ae98929 100644 |
--- a/ui/views/controls/combobox/combobox.cc |
+++ b/ui/views/controls/combobox/combobox.cc |
@@ -9,6 +9,7 @@ |
#include "base/message_loop/message_loop_proxy.h" |
#include "base/strings/utf_string_conversions.h" |
#include "ui/accessibility/ax_view_state.h" |
+#include "ui/base/ime/input_method.h" |
#include "ui/base/models/combobox_model.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/events/event.h" |
@@ -33,7 +34,6 @@ |
#include "ui/views/controls/menu/submenu_view.h" |
#include "ui/views/controls/prefix_selector.h" |
#include "ui/views/controls/textfield/textfield.h" |
-#include "ui/views/ime/input_method.h" |
#include "ui/views/mouse_constants.h" |
#include "ui/views/painter.h" |
#include "ui/views/widget/widget.h" |
@@ -335,12 +335,6 @@ void Combobox::SetInvalid(bool invalid) { |
SchedulePaint(); |
} |
-ui::TextInputClient* Combobox::GetTextInputClient() { |
- if (!selector_) |
- selector_.reset(new PrefixSelector(this)); |
- return selector_.get(); |
-} |
- |
void Combobox::Layout() { |
PrefixDelegate::Layout(); |
@@ -540,14 +534,18 @@ void Combobox::OnPaint(gfx::Canvas* canvas) { |
} |
void Combobox::OnFocus() { |
- GetInputMethod()->OnFocus(); |
+ if (GetInputMethod()) |
+ GetInputMethod()->SetFocusedTextInputClient(GetPrefixSelector()); |
+ |
View::OnFocus(); |
// Border renders differently when focused. |
SchedulePaint(); |
} |
void Combobox::OnBlur() { |
- GetInputMethod()->OnBlur(); |
+ if (GetInputMethod()) |
+ GetInputMethod()->DetachTextInputClient(GetPrefixSelector()); |
+ |
if (selector_) |
selector_->OnViewBlur(); |
// Border renders differently when focused. |
@@ -865,4 +863,10 @@ gfx::Size Combobox::ArrowSize() const { |
ignored); |
} |
+PrefixSelector* Combobox::GetPrefixSelector() { |
+ if (!selector_) |
+ selector_.reset(new PrefixSelector(this)); |
+ return selector_.get(); |
+} |
+ |
} // namespace views |