Index: chrome/browser/ui/views/find_bar_view.cc |
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc |
index c64082d83b91e7ddc841b61df6b866536cad8500..8d786443e9736bca0aefe812e5de53abc2c83742 100644 |
--- a/chrome/browser/ui/views/find_bar_view.cc |
+++ b/chrome/browser/ui/views/find_bar_view.cc |
@@ -22,6 +22,7 @@ |
#include "chrome/grit/generated_resources.h" |
#include "grit/theme_resources.h" |
#include "third_party/skia/include/core/SkPaint.h" |
+#include "ui/base/ime/input_method.h" |
#include "ui/base/ime/text_input_flags.h" |
#include "ui/base/l10n/l10n_util.h" |
#include "ui/base/resource/resource_bundle.h" |
@@ -32,7 +33,6 @@ |
#include "ui/views/border.h" |
#include "ui/views/controls/button/image_button.h" |
#include "ui/views/controls/label.h" |
-#include "ui/views/ime/input_method.h" |
#include "ui/views/painter.h" |
#include "ui/views/widget/widget.h" |
@@ -234,7 +234,7 @@ void FindBarView::ClearMatchCount() { |
void FindBarView::SetFocusAndSelection(bool select_all) { |
find_text_->RequestFocus(); |
- GetInputMethod()->ShowImeIfNeeded(); |
+ GetWidget()->GetInputMethod()->ShowImeIfNeeded(); |
sky
2015/06/29 02:17:41
Shouldn't focusing find_text_ take care of showing
Shu Chen
2015/06/29 02:56:34
Textfield::ShowImeIfNeeded() is only called for fo
sky
2015/06/30 16:32:31
That makes sense, but I couldn't readily determine
Shu Chen
2015/07/01 02:38:57
For mouse/touch events, Textfield can take care of
|
if (select_all && !find_text_->text().empty()) |
find_text_->SelectAll(true); |
} |