diff options
Diffstat (limited to 'ui/views/widget')
| -rw-r--r-- | ui/views/widget/native_widget_aura.cc | 11 | ||||
| -rw-r--r-- | ui/views/widget/native_widget_aura.h | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 89e75ca..619018b 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -93,7 +93,7 @@ class NativeWidgetAura::ActiveWindowObserver : public aura::WindowObserver { if (key != aura::kRootWindowActiveWindow) return; aura::Window* active = - aura::ActivationClient::GetActivationClient()->GetActiveWindow(); + aura::client::GetActivationClient()->GetActiveWindow(); if (!active || (active != host_->window_ && active->transient_parent() != host_->window_)) { host_->delegate_->EnableInactiveRendering(); @@ -187,7 +187,7 @@ void NativeWidgetAura::InitNativeWidget(const Widget::InitParams& params) { aura::client::SetDragDropDelegate(window_, this); } - aura::ActivationDelegate::SetActivationDelegate(window_, this); + aura::client::SetActivationDelegate(window_, this); if (window_type == Widget::InitParams::TYPE_MENU || window_type == Widget::InitParams::TYPE_TOOLTIP) @@ -442,16 +442,15 @@ bool NativeWidgetAura::IsVisible() const { } void NativeWidgetAura::Activate() { - aura::ActivationClient::GetActivationClient()->ActivateWindow(window_); + aura::client::GetActivationClient()->ActivateWindow(window_); } void NativeWidgetAura::Deactivate() { - aura::ActivationClient::GetActivationClient()->DeactivateWindow(window_); + aura::client::GetActivationClient()->DeactivateWindow(window_); } bool NativeWidgetAura::IsActive() const { - return aura::ActivationClient::GetActivationClient()->GetActiveWindow() == - window_; + return aura::client::GetActivationClient()->GetActiveWindow() == window_; } void NativeWidgetAura::SetAlwaysOnTop(bool on_top) { diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h index 89676a3..121b89b 100644 --- a/ui/views/widget/native_widget_aura.h +++ b/ui/views/widget/native_widget_aura.h @@ -29,7 +29,7 @@ class TooltipManagerAura; class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate, public aura::WindowDelegate, - public aura::ActivationDelegate, + public aura::client::ActivationDelegate, public aura::client::DragDropDelegate { public: explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate); @@ -140,7 +140,7 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate, virtual void OnWindowDestroyed() OVERRIDE; virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE; - // Overridden from aura::ActivationDelegate: + // Overridden from aura::client::ActivationDelegate: virtual bool ShouldActivate(aura::Event* event) OVERRIDE; virtual void OnActivated() OVERRIDE; virtual void OnLostActive() OVERRIDE; |