mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

update calls to use new namespaces

Browse source
This commit is contained in:
Heilig Benedek 2018-01-15 12:57:29 +01:00
parent 5e198d9dc6
commit 8d8b8c590d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/ui/win/atom_desktop_native_widget_aura.cc
View file

@ -12,7 +12,7 @@ AtomDesktopNativeWidgetAura::AtomDesktopNativeWidgetAura(
views::internal::NativeWidgetDelegate* delegate) views::internal::NativeWidgetDelegate* delegate)
: views::DesktopNativeWidgetAura(delegate) { : views::DesktopNativeWidgetAura(delegate) {
// This is to enable the override of OnWindowActivated // This is to enable the override of OnWindowActivated
aura::client::SetActivationChangeObserver(GetNativeWindow(), this); wm::SetActivationChangeObserver(GetNativeWindow(), this);
} }
void AtomDesktopNativeWidgetAura::Activate() { void AtomDesktopNativeWidgetAura::Activate() {
@ -24,14 +24,14 @@ void AtomDesktopNativeWidgetAura::Activate() {
} }
void AtomDesktopNativeWidgetAura::OnWindowActivated( void AtomDesktopNativeWidgetAura::OnWindowActivated(
aura::client::ActivationChangeObserver::ActivationReason reason, wm::ActivationChangeObserver::ActivationReason reason,
aura::Window* gained_active, aura::Window* gained_active,
aura::Window* lost_active) { aura::Window* lost_active) {
views::DesktopNativeWidgetAura::OnWindowActivated( views::DesktopNativeWidgetAura::OnWindowActivated(
reason, gained_active, lost_active); reason, gained_active, lost_active);
if (lost_active != nullptr) { if (lost_active != nullptr) {
auto* tooltip_controller = static_cast<views::corewm::TooltipController*>( auto* tooltip_controller = static_cast<views::corewm::TooltipController*>(
aura::client::GetTooltipClient(lost_active->GetRootWindow())); wm::GetTooltipClient(lost_active->GetRootWindow()));
// This will cause the tooltip to be hidden when a window is deactivated, // This will cause the tooltip to be hidden when a window is deactivated,
// as it should be. // as it should be.

2
atom/browser/ui/win/atom_desktop_native_widget_aura.h
View file

@ -20,7 +20,7 @@ class AtomDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura {
private: private:
void OnWindowActivated( void OnWindowActivated(
aura::client::ActivationChangeObserver::ActivationReason reason, wm::ActivationChangeObserver::ActivationReason reason,
aura::Window* gained_active, aura::Window* gained_active,
aura::Window* lost_active) override; aura::Window* lost_active) override;
DISALLOW_COPY_AND_ASSIGN(AtomDesktopNativeWidgetAura); DISALLOW_COPY_AND_ASSIGN(AtomDesktopNativeWidgetAura);