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

Unified Diff: views/widget/widget.h

Issue 6675005: Integrate the new input method API for Views into Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add some DCHECKs. Created 9 years, 9 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: views/widget/widget.h
diff --git a/views/widget/widget.h b/views/widget/widget.h
index c164c166445badf7a3813951040c5ea882093495..de0662bb1368040beb9a3c326ce032892c47b684 100644
--- a/views/widget/widget.h
+++ b/views/widget/widget.h
@@ -33,6 +33,7 @@ using ui::ThemeProvider;
namespace views {
class DefaultThemeProvider;
+class InputMethod;
class NativeWidget;
class RootView;
class TooltipManager;
@@ -211,6 +212,10 @@ class Widget : public internal::NativeWidgetDelegate,
// TODO(beng): remove virtual.
virtual FocusManager* GetFocusManager();
+ // Returns the InputMethod for this widget.
+ // Note that all widgets in a widget hierarchy share the same input method.
+ InputMethod* GetInputMethod() const;
+
// Returns true if the native view |native_view| is contained in the
// views::View hierarchy rooted at this widget.
// TODO(beng): const.
@@ -260,7 +265,7 @@ class Widget : public internal::NativeWidgetDelegate,
ui::AccessibilityTypes::Event event_type,
bool send_native_event) = 0;
- NativeWidget* native_widget() { return native_widget_; }
+ NativeWidget* native_widget() const { return native_widget_; }
// Overridden from NativeWidgetDelegate:
virtual void OnNativeFocus(gfx::NativeView focused_view) OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698