update calls to use new namespaces

electron · Jan 15, 2018 · 2a34390 · 2a34390
1 parent a40dc20
commit 2a34390
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/atom/browser/ui/win/atom_desktop_native_widget_aura.cc b/atom/browser/ui/win/atom_desktop_native_widget_aura.cc
@@ -12,7 +12,7 @@ AtomDesktopNativeWidgetAura::AtomDesktopNativeWidgetAura(
     views::internal::NativeWidgetDelegate* delegate)
     : views::DesktopNativeWidgetAura(delegate) {
   // This is to enable the override of OnWindowActivated
-  aura::client::SetActivationChangeObserver(GetNativeWindow(), this);
+  wm::SetActivationChangeObserver(GetNativeWindow(), this);
 }
 
 void AtomDesktopNativeWidgetAura::Activate() {
@@ -24,14 +24,14 @@ void AtomDesktopNativeWidgetAura::Activate() {
 }
 
 void AtomDesktopNativeWidgetAura::OnWindowActivated(
-    aura::client::ActivationChangeObserver::ActivationReason reason,
+    wm::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   views::DesktopNativeWidgetAura::OnWindowActivated(
     reason, gained_active, lost_active);
   if (lost_active != nullptr) {
     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,
     // as it should be.

diff --git a/atom/browser/ui/win/atom_desktop_native_widget_aura.h b/atom/browser/ui/win/atom_desktop_native_widget_aura.h
@@ -20,7 +20,7 @@ class AtomDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura {
 
  private:
   void OnWindowActivated(
-      aura::client::ActivationChangeObserver::ActivationReason reason,
+      wm::ActivationChangeObserver::ActivationReason reason,
       aura::Window* gained_active,
       aura::Window* lost_active) override;
   DISALLOW_COPY_AND_ASSIGN(AtomDesktopNativeWidgetAura);