chrome/browser/ui/views/omnibox/omnibox_view_views.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/omnibox/omnibox_view_views.cc

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

Patch Set: reverted changes for MockInputMethod. 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/ui/views/find_bar_view.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | ui/base/ime/input_method_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc

index 48ce4fcd4c0be408f1336a7cb0938b2281a4ea8f..36d96e9cc265bb1dccdadb73df0eb80bf01445e6 100644

--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc

+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc

@@ -35,6 +35,7 @@

#include "ui/base/clipboard/scoped_clipboard_writer.h"

#include "ui/base/dragdrop/drag_drop_types.h"

#include "ui/base/dragdrop/os_exchange_data.h"

+#include "ui/base/ime/input_method.h"

#include "ui/base/ime/text_input_client.h"

#include "ui/base/ime/text_input_type.h"

#include "ui/base/l10n/l10n_util.h"

@@ -48,7 +49,6 @@

#include "ui/views/border.h"

#include "ui/views/button_drag_utils.h"

#include "ui/views/controls/textfield/textfield.h"

-#include "ui/views/ime/input_method.h"

#include "ui/views/layout/fill_layout.h"

#include "ui/views/widget/widget.h"

#include "url/gurl.h"

@@ -579,8 +579,7 @@ bool OmniboxViewViews::IsImeShowingPopup() const {

#if defined(OS_CHROMEOS)

return ime_candidate_window_open_;

#else

- const views::InputMethod* input_method = this->GetInputMethod();

- return input_method && input_method->IsCandidatePopupOpen();

+ return GetInputMethod() ? GetInputMethod()->IsCandidatePopupOpen() : false;

#endif

}