Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

Unified Diff: ui/views/view.h

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits. 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 | « ui/views/test/widget_test_mac.mm ('k') | ui/views/view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view.h
diff --git a/ui/views/view.h b/ui/views/view.h
index 7e3183e43cfa0f6f997197fe49b45991be8afc99..9447c1f66e9d5068c84ded6301746e8f94f389d4 100644
--- a/ui/views/view.h
+++ b/ui/views/view.h
@@ -50,6 +50,7 @@ class Transform;
namespace ui {
struct AXViewState;
class Compositor;
+class InputMethod;
class Layer;
class NativeTheme;
class PaintContext;
@@ -66,7 +67,6 @@ class ContextMenuController;
class DragController;
class FocusManager;
class FocusTraversable;
-class InputMethod;
class LayoutManager;
class NativeViewAccessibility;
class ScrollView;
@@ -692,15 +692,13 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
return notify_enter_exit_on_child_;
}
- // Returns the View's TextInputClient instance or NULL if the View doesn't
- // support text input.
- virtual ui::TextInputClient* GetTextInputClient();
-
// Convenience method to retrieve the InputMethod associated with the
- // Widget that contains this view. Returns NULL if this view is not part of a
- // view hierarchy with a Widget.
- virtual InputMethod* GetInputMethod();
- virtual const InputMethod* GetInputMethod() const;
+ // Widget that contains this view.
+ ui::InputMethod* GetInputMethod() {
+ return const_cast<ui::InputMethod*>(
+ const_cast<const View*>(this)->GetInputMethod());
+ }
+ const ui::InputMethod* GetInputMethod() const;
// Sets a new ViewTargeter for the view, and returns the previous
// ViewTargeter.
« no previous file with comments | « ui/views/test/widget_test_mac.mm ('k') | ui/views/view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698