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

Unified Diff: components/exo/wayland/server.cc

Issue 2868623002: Don't send activation event when created (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/wayland/server.cc
diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
index 0faf554a77fa0640b1b0682db10e94bb6d1b814e..151ee48b209398c572b5c0e5451f4c54122253f3 100644
--- a/components/exo/wayland/server.cc
+++ b/components/exo/wayland/server.cc
@@ -158,8 +158,9 @@ DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSurfaceHasSecurityKey, false);
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSurfaceHasBlendingKey, false);
// A property key containing a boolean set to true whether the current
-// OnWindowActivated invocation should be ignored.
-DEFINE_UI_CLASS_PROPERTY_KEY(bool, kIgnoreWindowActivated, false);
+// OnWindowActivated invocation should be ignored. The defualt is true
+// to ignore the activation event originated by creation.
+DEFINE_UI_CLASS_PROPERTY_KEY(bool, kIgnoreWindowActivated, true);
wl_resource* GetSurfaceResource(Surface* surface) {
return surface->GetProperty(kSurfaceResourceKey);
@@ -1935,8 +1936,8 @@ void remote_surface_activate(wl_client* client,
// Activation on Aura is synchronous, so activation callbacks will be called
// before the flag is reset.
window->SetProperty(kIgnoreWindowActivated, true);
- GetUserDataAs<ShellSurface>(resource)->Activate();
- window->ClearProperty(kIgnoreWindowActivated);
+ shell_surface->Activate();
+ window->SetProperty(kIgnoreWindowActivated, false);
}
void remote_surface_maximize(wl_client* client, wl_resource* resource) {
@@ -2121,8 +2122,10 @@ class WaylandRemoteShell : public WMHelper::MaximizeModeObserver,
// already activated on the client side, so do not notify about the
// activation. It means that zcr_remote_shell_v1_send_activated is used
// only to notify about activations originating in Aura.
- if (gained_active && gained_active->GetProperty(kIgnoreWindowActivated))
+ if (gained_active && gained_active->GetProperty(kIgnoreWindowActivated)) {
+ gained_active->SetProperty(kIgnoreWindowActivated, false);
return;
+ }
SendActivated(gained_active, lost_active);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698