Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ | 5 #ifndef UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ |
| 6 #define UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ | 6 #define UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ |
| 7 | 7 |
| 8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
| 9 | 9 |
| 10 namespace ui { | |
| 11 class TextInputClient; | |
| 12 } | |
| 13 | |
| 10 namespace views { | 14 namespace views { |
| 11 class View; | 15 class View; |
| 12 } | 16 } |
| 13 | 17 |
| 14 // The NSView that sits as the root contentView of the NSWindow, whilst it has | 18 // The NSView that sits as the root contentView of the NSWindow, whilst it has |
| 15 // a views::RootView present. Bridges requests from Cocoa to the hosted | 19 // a views::RootView present. Bridges requests from Cocoa to the hosted |
| 16 // views::View. | 20 // views::View. |
| 17 @interface BridgedContentView : NSView { | 21 @interface BridgedContentView : NSView<NSTextInputClient> { |
| 18 @private | 22 @private |
| 19 // Weak. The hosted RootView, owned by hostedView_->GetWidget(). | 23 // Weak. The hosted RootView, owned by hostedView_->GetWidget(). |
| 20 views::View* hostedView_; | 24 views::View* hostedView_; |
| 25 ui::TextInputClient* textInputClient_; | |
|
tapted
2014/06/17 13:23:56
This needs a comment, along with something about w
Andre
2014/06/18 21:48:34
Done.
| |
| 21 } | 26 } |
| 22 | 27 |
| 23 @property(readonly, nonatomic) views::View* view; | 28 @property(readonly, nonatomic) views::View* view; |
| 24 | 29 |
| 25 // Initialize the NSView -> views::View bridge. |viewToHost| must be non-NULL. | 30 // Initialize the NSView -> views::View bridge. |viewToHost| must be non-NULL. |
| 26 - (id)initWithView:(views::View*)viewToHost; | 31 - (id)initWithView:(views::View*)viewToHost; |
| 27 | 32 |
| 28 // Clear the hosted view. For example, if it is about to be destroyed. | 33 // Clear the hosted view. For example, if it is about to be destroyed. |
| 29 - (void)clearView; | 34 - (void)clearView; |
| 30 | 35 |
| 36 - (void)setTextInputClient:(ui::TextInputClient*)textInputClient; | |
|
tapted
2014/06/17 13:23:56
you could probably make this a property.
If it's
Andre
2014/06/18 21:48:34
Done.
| |
| 37 | |
| 31 @end | 38 @end |
| 32 | 39 |
| 33 #endif // UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ | 40 #endif // UI_VIEWS_COCOA_BRIDGED_CONTENT_VIEW_H_ |
| OLD | NEW |