chrome/browser/ui/views/find_bar_view.cc - Issue 1177503003: Remove the 2-level input method system & InputMethodBridge.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/find_bar_view.cc

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: makes trybots green. Created 5 years, 6 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 | « chrome/browser/chromeos/options/passphrase_textfield.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | ui/base/ime/mock_input_method.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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();

if (select_all && !find_text_->text().empty())

find_text_->SelectAll(true);

}