Chromium Code Reviews| Index: ui/views/cocoa/bridged_content_view.h |
| diff --git a/ui/views/cocoa/bridged_content_view.h b/ui/views/cocoa/bridged_content_view.h |
| index e7c83f74af50011ff894580187d34efb4786e04a..fb91300c68a5145d97a1d8c2b9cc178825adbfae 100644 |
| --- a/ui/views/cocoa/bridged_content_view.h |
| +++ b/ui/views/cocoa/bridged_content_view.h |
| @@ -7,23 +7,37 @@ |
| #import <Cocoa/Cocoa.h> |
| +namespace ui { |
| +class TextInputClient; |
| +} |
| + |
| namespace views { |
| class View; |
| +class BridgedNativeWidget; |
|
tapted
2014/06/19 01:29:15
nit: sort
Andre
2014/06/19 23:20:25
Deleted, no longer needed.
|
| } |
| // The NSView that sits as the root contentView of the NSWindow, whilst it has |
| // a views::RootView present. Bridges requests from Cocoa to the hosted |
| // views::View. |
| -@interface BridgedContentView : NSView { |
| +@interface BridgedContentView : NSView<NSTextInputClient> { |
| @private |
| // Weak. The hosted RootView, owned by hostedView_->GetWidget(). |
| views::View* hostedView_; |
| + |
| + views::BridgedNativeWidget* parent_; // Weak. Owns this. |
| + |
| + // Weak. If non-null the TextInputClient of the currently focused View in the |
| + // hierarchy rooted at |hostedView_|. Owned by the focused View. |
| + ui::TextInputClient* textInputClient_; |
| } |
| @property(readonly, nonatomic) views::View* hostedView; |
| +@property(assign, nonatomic) ui::TextInputClient* textInputClient; |
| -// Initialize the NSView -> views::View bridge. |viewToHost| must be non-NULL. |
| -- (id)initWithView:(views::View*)viewToHost; |
| +// Initialize the NSView -> views::View bridge. |viewToHost| and |parent| |
| +// must be non-NULL. |
| +- (id)initWithView:(views::View*)viewToHost |
| + parent:(views::BridgedNativeWidget*)parent; |
| // Clear the hosted view. For example, if it is about to be destroyed. |
| - (void)clearView; |