Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(792)

Unified Diff: ui/views/widget/native_widget_aura.cc

Issue 8956004: Move ActivationClient/Delegate to client namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/native_widget_aura.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_aura.cc
===================================================================
--- ui/views/widget/native_widget_aura.cc (revision 114595)
+++ ui/views/widget/native_widget_aura.cc (working copy)
@@ -93,7 +93,7 @@
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 @@
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 @@
}
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) {
« no previous file with comments | « ui/views/widget/native_widget_aura.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698