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

Unified Diff: ui/views/cocoa/bridged_content_view.h

Issue 329463002: MacViews: Implement text input. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to master Created 6 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
« no previous file with comments | « no previous file | ui/views/cocoa/bridged_content_view.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..25fb364c4f92a60c1233778fd39dae18f9b595dc 100644
--- a/ui/views/cocoa/bridged_content_view.h
+++ b/ui/views/cocoa/bridged_content_view.h
@@ -7,6 +7,10 @@
#import <Cocoa/Cocoa.h>
+namespace ui {
+class TextInputClient;
+}
+
namespace views {
class View;
}
@@ -14,13 +18,18 @@ class View;
// 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_;
+
+ // 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;
« no previous file with comments | « no previous file | ui/views/cocoa/bridged_content_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698