diff options
Diffstat (limited to 'chromium/ui/views_bridge_mac/bridged_content_view.h')
| -rw-r--r-- | chromium/ui/views_bridge_mac/bridged_content_view.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/chromium/ui/views_bridge_mac/bridged_content_view.h b/chromium/ui/views_bridge_mac/bridged_content_view.h index b10f06bbb3b..7c096dd2cdd 100644 --- a/chromium/ui/views_bridge_mac/bridged_content_view.h +++ b/chromium/ui/views_bridge_mac/bridged_content_view.h @@ -32,17 +32,6 @@ VIEWS_EXPORT // Weak, reset by clearView. views::BridgedNativeWidgetImpl* bridge_; - // Weak. If non-null the TextInputClient of the currently focused View in the - // hierarchy rooted at |hostedView_|. Owned by the focused View. - // TODO(ccameron): Remove this member. - ui::TextInputClient* textInputClient_; - - // The TextInputClient about to be set. Requests for a new -inputContext will - // use this, but while the input is changing, |self| still needs to service - // IME requests using the old |textInputClient_|. - // TODO(ccameron): Remove this member. - ui::TextInputClient* pendingTextInputClient_; - // A tracking area installed to enable mouseMoved events. ui::ScopedCrTrackingArea cursorTrackingArea_; @@ -62,7 +51,6 @@ VIEWS_EXPORT } @property(readonly, nonatomic) views::BridgedNativeWidgetImpl* bridge; -@property(assign, nonatomic) ui::TextInputClient* textInputClient; @property(assign, nonatomic) BOOL drawMenuBackgroundForBlur; // Initialize the NSView -> views::View bridge. |viewToHost| must be non-NULL. @@ -85,6 +73,14 @@ VIEWS_EXPORT // or not. - (void)updateFullKeyboardAccess; +// The TextInputClient of the currently focused views::View. +// TODO(ccameron): This cannot be relied on across processes. +- (ui::TextInputClient*)textInputClient; + +// Returns true if it is needed to call -[NSApp updateWindows] while updating +// the text input client. +- (bool)needsUpdateWindows; + @end #endif // UI_VIEWS_BRIDGE_MAC_BRIDGED_CONTENT_VIEW_H_ |