| Index: ui/views/widget/native_widget_aura.cc
|
| diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
|
| index b93f0ff08bc6011d943d73ffcbebec1a0a19ec21..67dfecf137252c6bf55f1807bfb2887302e9c389 100644
|
| --- a/ui/views/widget/native_widget_aura.cc
|
| +++ b/ui/views/widget/native_widget_aura.cc
|
| @@ -773,14 +773,16 @@ bool NativeWidgetAura::ShouldActivate(aura::Event* event) {
|
| }
|
|
|
| void NativeWidgetAura::OnActivated() {
|
| - GetWidget()->GetFocusManager()->RestoreFocusedView();
|
| + if (GetWidget()->HasFocusManager())
|
| + GetWidget()->GetFocusManager()->RestoreFocusedView();
|
| delegate_->OnNativeWidgetActivationChanged(true);
|
| if (IsVisible() && GetWidget()->non_client_view())
|
| GetWidget()->non_client_view()->SchedulePaint();
|
| }
|
|
|
| void NativeWidgetAura::OnLostActive() {
|
| - GetWidget()->GetFocusManager()->StoreFocusedView();
|
| + if (GetWidget()->HasFocusManager())
|
| + GetWidget()->GetFocusManager()->StoreFocusedView();
|
| delegate_->OnNativeWidgetActivationChanged(false);
|
| if (IsVisible() && GetWidget()->non_client_view())
|
| GetWidget()->non_client_view()->SchedulePaint();
|
|
|