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

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: 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
Index: ui/views/view.h
diff --git a/ui/views/view.h b/ui/views/view.h
index 7e3183e43cfa0f6f997197fe49b45991be8afc99..bfba7a18967d86b6e628d5440c0af6f023c1bef5 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;
@@ -697,10 +697,9 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
virtual ui::TextInputClient* GetTextInputClient();
James Su 2015/06/12 07:58:50 This method should be removed.
Shu Chen 2015/06/12 08:51:31 Removing this method should be included in a separ
// 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();
+ const ui::InputMethod* GetInputMethod() const;
// Sets a new ViewTargeter for the view, and returns the previous
// ViewTargeter.

Powered by Google App Engine
This is Rietveld 408576698