Commit 32977707 authored by khmel's avatar khmel Committed by Commit Bot

Load app icon for Linux.

This fixes the issue when Linux implementation of the assigning app icon
for the window does not request image representation and as result icon
is not loaded.

Bug: 779463
Test: Manually
Change-Id: I33ac3733ad1a428c6a448bc3845d2589ff640d09
Reviewed-on: https://chromium-review.googlesource.com/807398Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarElliot Glaysher <erg@chromium.org>
Commit-Queue: Yury Khmel <khmel@google.com>
Cr-Commit-Position: refs/heads/master@{#521569}
parent a788b14f
......@@ -1074,10 +1074,10 @@ void DesktopWindowTreeHostX11::SetWindowIcons(
// All of this could be made much, much better.
std::vector<unsigned long> data;
if (window_icon.HasRepresentation(1.0f))
if (!window_icon.isNull())
SerializeImageRepresentation(window_icon.GetRepresentation(1.0f), &data);
if (app_icon.HasRepresentation(1.0f))
if (!app_icon.isNull())
SerializeImageRepresentation(app_icon.GetRepresentation(1.0f), &data);
if (!data.empty())
......
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