Chromium Code Reviews| Index: ui/views/cocoa/bridged_content_view.mm |
| diff --git a/ui/views/cocoa/bridged_content_view.mm b/ui/views/cocoa/bridged_content_view.mm |
| index 6022a44723bf99d9873d04bd6dcbebdb7bc66697..d3078ec5f434c7df535b6a190446de550ce07e49 100644 |
| --- a/ui/views/cocoa/bridged_content_view.mm |
| +++ b/ui/views/cocoa/bridged_content_view.mm |
| @@ -407,6 +407,24 @@ gfx::Rect GetFirstRectForRangeHelper(const ui::TextInputClient* client, |
| return YES; |
| } |
| +- (BOOL)becomeFirstResponder { |
| + BOOL result = [super becomeFirstResponder]; |
| + if (result) { |
|
tapted
2016/03/04 00:56:19
We need to check for |hostedView_| being null sinc
kirr
2016/03/04 08:31:30
Done. Thanks.
|
| + views::Widget* widget = hostedView_->GetWidget(); |
| + widget->GetFocusManager()->RestoreFocusedView(); |
| + } |
| + return result; |
| +} |
| + |
| +- (BOOL)resignFirstResponder { |
| + BOOL result = [super resignFirstResponder]; |
| + if (result) { |
| + views::Widget* widget = hostedView_->GetWidget(); |
| + widget->GetFocusManager()->StoreFocusedView(true); |
| + } |
| + return result; |
| +} |
| + |
| - (void)viewDidMoveToWindow { |
| // When this view is added to a window, AppKit calls setFrameSize before it is |
| // added to the window, so the behavior in setFrameSize is not triggered. |