diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc index c2c621215311..ad85cb016992 100644 --- a/atom/browser/native_window_views.cc +++ b/atom/browser/native_window_views.cc @@ -205,7 +205,7 @@ NativeWindowViews::NativeWindowViews( if (parent) params.parent = parent->GetNativeWindow(); - params.native_widget = new AtomDeskopNativeWidgetAura(window_.get(), this); + params.native_widget = new AtomDesktopNativeWidgetAura(window_.get(), this); atom_desktop_window_tree_host_win_ = new AtomDesktopWindowTreeHostWin( this, window_.get(), diff --git a/atom/browser/ui/win/atom_desktop_native_widget_aura.cc b/atom/browser/ui/win/atom_desktop_native_widget_aura.cc index 4e2cc60bff47..2986fdf8ae2d 100644 --- a/atom/browser/ui/win/atom_desktop_native_widget_aura.cc +++ b/atom/browser/ui/win/atom_desktop_native_widget_aura.cc @@ -6,15 +6,16 @@ namespace atom { -AtomDeskopNativeWidgetAura::AtomDeskopNativeWidgetAura( +AtomDesktopNativeWidgetAura::AtomDesktopNativeWidgetAura( views::internal::NativeWidgetDelegate* delegate, NativeWindowViews* window) : views::DesktopNativeWidgetAura(delegate), window_(window) { } -bool AtomDeskopNativeWidgetAura::CanFocus() { - return window_->IsVisible(); +void AtomDesktopNativeWidgetAura::Activate() { + if (window_->IsVisible()) + views::DesktopNativeWidgetAura::Activate(); } } // namespace atom diff --git a/atom/browser/ui/win/atom_desktop_native_widget_aura.h b/atom/browser/ui/win/atom_desktop_native_widget_aura.h index 7048a47c19c7..a41d48d73f60 100644 --- a/atom/browser/ui/win/atom_desktop_native_widget_aura.h +++ b/atom/browser/ui/win/atom_desktop_native_widget_aura.h @@ -10,18 +10,18 @@ namespace atom { -class AtomDeskopNativeWidgetAura : public views::DesktopNativeWidgetAura { +class AtomDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura { public: - AtomDeskopNativeWidgetAura(views::internal::NativeWidgetDelegate* delegate, + AtomDesktopNativeWidgetAura(views::internal::NativeWidgetDelegate* delegate, NativeWindowViews* window); - // aura::WindowDelegate - bool CanFocus() override; + // internal::NativeWidgetPrivate: + void Activate() override; private: NativeWindowViews* window_; - DISALLOW_COPY_AND_ASSIGN(AtomDeskopNativeWidgetAura); + DISALLOW_COPY_AND_ASSIGN(AtomDesktopNativeWidgetAura); }; } // namespace atom