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

commit a19209825989de7d6b620aea95dd0f95b5c3c03f
Author: khmel <khmel@chromium.org>
Date: Wed Mar 22 05:21:55 2017

arc: Fix regression in handling ARC shelf item.

This fix regressions caused by recent refactoring. First regression is
in case multiple shelf items for the same ARC app, clicking on shelf
item always activates last opened window. It is expected that in this
case last active window of that app becomes active. Second one,
selecting which item to activate from menu does not actually activate
selected item

BUG= 703895 
TEST=Manually, unit_tests extended.

Review-Url: https://codereview.chromium.org/2763893004
Cr-Commit-Position: refs/heads/master@{#458638}

[modify] https://crrev.com/a19209825989de7d6b620aea95dd0f95b5c3c03f/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
[modify] https://crrev.com/a19209825989de7d6b620aea95dd0f95b5c3c03f/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc
[modify] https://crrev.com/a19209825989de7d6b620aea95dd0f95b5c3c03f/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.h
[modify] https://crrev.com/a19209825989de7d6b620aea95dd0f95b5c3c03f/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

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

commit e62cb970ec7675219a52e1f529136335fc95970d
Author: khmel <khmel@chromium.org>
Date: Thu Mar 23 01:45:10 2017

[Merge M58] arc: Fix regression in handling ARC shelf item.

This fix regressions caused by recent refactoring. First regression is
in case multiple shelf items for the same ARC app, clicking on shelf
item always activates last opened window. It is expected that in this
case last active window of that app becomes active. Second one,
selecting which item to activate from menu does not actually activate
selected item

BUG= 703895 
TEST=Manually, unit_tests extended.
NOTRY=true
NOPRESUBMIT=true
TBR=msw@chromium.org

Review-Url: https://codereview.chromium.org/2763893004
Cr-Commit-Position: refs/heads/master@{#458638}
(cherry picked from commit a19209825989de7d6b620aea95dd0f95b5c3c03f)

Review-Url: https://codereview.chromium.org/2773493002
Cr-Commit-Position: refs/branch-heads/3029@{#377}
Cr-Branched-From: 939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}

[modify] https://crrev.com/e62cb970ec7675219a52e1f529136335fc95970d/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
[modify] https://crrev.com/e62cb970ec7675219a52e1f529136335fc95970d/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc
[modify] https://crrev.com/e62cb970ec7675219a52e1f529136335fc95970d/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.h
[modify] https://crrev.com/e62cb970ec7675219a52e1f529136335fc95970d/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

58.0.3029.36/9334.20.0