Commit eb6d82cd authored by xiaolingbao's avatar xiaolingbao Committed by Commit bot

Only update icon if the new one is not null on x11, no-op for null icon...

Only update icon if the new one is not null on x11, no-op for null icon (follow the same way as Windows platform does in HWNDMessageHandler::SetWindowIcons)

BUG=478714.

Review URL: https://codereview.chromium.org/1138343003

Cr-Commit-Position: refs/heads/master@{#329704}
parent 55b415e1
...@@ -793,9 +793,7 @@ void DesktopWindowTreeHostX11::SetWindowIcons( ...@@ -793,9 +793,7 @@ void DesktopWindowTreeHostX11::SetWindowIcons(
if (app_icon.HasRepresentation(1.0f)) if (app_icon.HasRepresentation(1.0f))
SerializeImageRepresentation(app_icon.GetRepresentation(1.0f), &data); SerializeImageRepresentation(app_icon.GetRepresentation(1.0f), &data);
if (data.empty()) if (!data.empty())
XDeleteProperty(xdisplay_, xwindow_, atom_cache_.GetAtom("_NET_WM_ICON"));
else
ui::SetAtomArrayProperty(xwindow_, "_NET_WM_ICON", "CARDINAL", data); ui::SetAtomArrayProperty(xwindow_, "_NET_WM_ICON", "CARDINAL", data);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment