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

Unified Diff: ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc

Issue 23702017: Ensure that the AURA focused window is set correctly when the window is activated. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 3 months 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
Index: ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
===================================================================
--- ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc (revision 220973)
+++ ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc (working copy)
@@ -160,21 +160,9 @@
bool active) {
if (active)
root_window_host_delegate_->OnHostActivated();
- native_widget_delegate_->OnNativeWidgetActivationChanged(active);
- // If we're not active we need to deactivate the corresponding aura::Window.
- // This way if a child widget is active it gets correctly deactivated (child
- // widgets don't get native desktop activation changes, only aura activation
- // changes).
- if (!active) {
- aura::client::ActivationClient* activation_client =
- aura::client::GetActivationClient(root_window_);
- if (activation_client) {
- aura::Window* active_window = activation_client->GetActiveWindow();
- if (active_window)
- activation_client->DeactivateWindow(active_window);
- }
- }
+ desktop_native_widget_aura_->HandleActivationChanged(active);
+
native_widget_delegate_->AsWidget()->GetRootView()->SchedulePaint();
}
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_root_window_host_win.cc ('k') | ui/views/widget/widget_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698