[Merge M58] arc: Restore Chrome badging for apps that have peer in Android apps.

[Merge M58]  arc: Restore Chrome badging for apps that have peer in Android apps.

This fix issue when running app for such apps does not have Chrome
badging. This CL does not apply AppWindow icon to shelf item if window
does not override its default icon. AppWindow might have its own icon
(sine M54), however if it is not set then app icon is used. From other
side shelf launcher controller has extra logic by applying additional
badging over the icon.

TEST=Manually
BUG=708830
BUG=b/35258599

TBR=msw@chromium.org,reillyg@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2804623004
Cr-Commit-Position: refs/heads/master@{#462661}
(cherry picked from commit 3d8e30ac4d15e9f85e57423bc38eaafd762dd821)

Review-Url: https://codereview.chromium.org/2813073002
Cr-Commit-Position: refs/branch-heads/3029@{#675}
Cr-Branched-From: 939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}
Committed: https://chromium.googlesource.com/chromium/src/+/231c83116e0db5ae649af12080d7498ad207a06f

[khmel, 2017-04-12 00:25:31]

Description was changed from

==========
arc: Restore Chrome badging for apps that have peer in Android apps.

This fix issue when running app for such apps does not have Chrome
badging. This CL does not apply AppWindow icon to shelf item if window
does not override its default icon. AppWindow might have its own icon
(sine M54), however if it is not set then app icon is used. From other
side shelf launcher controller has extra logic by applying additional
badging over the icon.

TEST=Manually
BUG=708830
BUG=b/35258599

Review-Url: https://codereview.chromium.org/2804623004
Cr-Commit-Position: refs/heads/master@{#462661}
(cherry picked from commit 3d8e30ac4d15e9f85e57423bc38eaafd762dd821)
==========

to

==========
[Merge M58]  arc: Restore Chrome badging for apps that have peer in Android
apps.

This fix issue when running app for such apps does not have Chrome
badging. This CL does not apply AppWindow icon to shelf item if window
does not override its default icon. AppWindow might have its own icon
(sine M54), however if it is not set then app icon is used. From other
side shelf launcher controller has extra logic by applying additional
badging over the icon.

TEST=Manually
BUG=708830
BUG=b/35258599

TBR=msw@chromium.org,reillyg@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2804623004
Cr-Commit-Position: refs/heads/master@{#462661}
(cherry picked from commit 3d8e30ac4d15e9f85e57423bc38eaafd762dd821)
==========

[khmel, 2017-04-12 00:58:28]

The CQ bit was checked by khmel@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-04-12 00:58:57]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-04-12 00:59:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-04-12 00:59:15]

Dry run: This issue passed the CQ dry run.

[khmel, 2017-04-12 02:26:14]

The CQ bit was checked by khmel@chromium.org

[commit-bot: I haz the power, 2017-04-12 02:26:51]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-04-12 02:34:00]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1491963974271770,
"parent_rev": "cb65deb6746cd262ff82bef478127e34d0110fd2", "commit_rev":
"231c83116e0db5ae649af12080d7498ad207a06f"}

[commit-bot: I haz the power, 2017-04-12 02:34:55]

Description was changed from

==========
[Merge M58]  arc: Restore Chrome badging for apps that have peer in Android
apps.

This fix issue when running app for such apps does not have Chrome
badging. This CL does not apply AppWindow icon to shelf item if window
does not override its default icon. AppWindow might have its own icon
(sine M54), however if it is not set then app icon is used. From other
side shelf launcher controller has extra logic by applying additional
badging over the icon.

TEST=Manually
BUG=708830
BUG=b/35258599

TBR=msw@chromium.org,reillyg@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2804623004
Cr-Commit-Position: refs/heads/master@{#462661}
(cherry picked from commit 3d8e30ac4d15e9f85e57423bc38eaafd762dd821)
==========

to

==========
[Merge M58]  arc: Restore Chrome badging for apps that have peer in Android
apps.

This fix issue when running app for such apps does not have Chrome
badging. This CL does not apply AppWindow icon to shelf item if window
does not override its default icon. AppWindow might have its own icon
(sine M54), however if it is not set then app icon is used. From other
side shelf launcher controller has extra logic by applying additional
badging over the icon.

TEST=Manually
BUG=708830
BUG=b/35258599

TBR=msw@chromium.org,reillyg@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2804623004
Cr-Commit-Position: refs/heads/master@{#462661}
(cherry picked from commit 3d8e30ac4d15e9f85e57423bc38eaafd762dd821)

Review-Url: https://codereview.chromium.org/2813073002
Cr-Commit-Position: refs/branch-heads/3029@{#675}
Cr-Branched-From:
939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}
Committed:
https://chromium.googlesource.com/chromium/src/+/231c83116e0db5ae649af12080d7...
==========

[commit-bot: I haz the power, 2017-04-12 02:34:56]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/chromium/src/+/231c83116e0db5ae649af12080d7...