summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
index 10cf688..bf104f2 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -364,6 +364,13 @@ void AutocompletePopupContentsView::UpdatePopupAppearance() {
popup_->SetContentsView(this);
popup_->MoveAbove(
GetRelativeWindowForPopup(omnibox_view_->GetNativeView()));
+ if (!popup_.get()) {
+ // For some IMEs GetRelativeWindowForPopup triggers the omnibox to lose
+ // focus, thereby closing (and destroying) the popup.
+ // TODO: this won't be needed once we close the omnibox on input window
+ // showing.
+ return;
+ }
popup_->Show();
} else {
// Animate the popup shrinking, but don't animate growing larger since that