The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3d8e30ac4d15e9f85e57423bc38eaafd762dd821

commit 3d8e30ac4d15e9f85e57423bc38eaafd762dd821
Author: khmel <khmel@chromium.org>
Date: Thu Apr 06 22:45:31 2017

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}

[modify] https://crrev.com/3d8e30ac4d15e9f85e57423bc38eaafd762dd821/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
[modify] https://crrev.com/3d8e30ac4d15e9f85e57423bc38eaafd762dd821/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
[modify] https://crrev.com/3d8e30ac4d15e9f85e57423bc38eaafd762dd821/chrome/test/data/extensions/platform_apps/app_icon/test.js
[modify] https://crrev.com/3d8e30ac4d15e9f85e57423bc38eaafd762dd821/extensions/browser/app_window/app_window.cc
[modify] https://crrev.com/3d8e30ac4d15e9f85e57423bc38eaafd762dd821/extensions/browser/app_window/app_window.h

This bug requires manual review: We are only 12 days from stable.
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), bhthompson@(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/231c83116e0db5ae649af12080d7498ad207a06f

commit 231c83116e0db5ae649af12080d7498ad207a06f
Author: khmel <khmel@chromium.org>
Date: Wed Apr 12 02:33:55 2017

[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}

[modify] https://crrev.com/231c83116e0db5ae649af12080d7498ad207a06f/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
[modify] https://crrev.com/231c83116e0db5ae649af12080d7498ad207a06f/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
[modify] https://crrev.com/231c83116e0db5ae649af12080d7498ad207a06f/chrome/test/data/extensions/platform_apps/app_icon/test.js
[modify] https://crrev.com/231c83116e0db5ae649af12080d7498ad207a06f/extensions/browser/app_window/app_window.cc
[modify] https://crrev.com/231c83116e0db5ae649af12080d7498ad207a06f/extensions/browser/app_window/app_window.h