[Merge M58] arc: Fix crash on deferred app launch.

[Merge M58] arc: Fix crash on deferred app launch.

This fixes regression due recent shelf refactoring when meaning
of TYPE_APP AND TYPE_SHORTCUT_APP was changed. ARC defered
launcher is allowed only over shortcuts.

TEST=Manually
BUG=701152
TBR=msw@chromium.org
NOTRY=true
NOPRESUBMIT=true

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

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

[khmel, 2017-03-17 18:06:12]

Description was changed from

==========
[Merge M58] arc: Fix crash on deferred app launch.

This fixes regression due recent shelf refactoring when meaning
of TYPE_APP AND TYPE_SHORTCUT_APP was changed. ARC defered
launcher is allowed only over shortcuts.

TEST=Manually
BUG=701152
TBR=msw@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2747983002
Cr-Commit-Position: refs/heads/master@{#456830}
(cherry picked from commit b1a39b125d0cc6b6994b92089ebc877b693a6ddd)
==========

to

==========
[Merge M58] arc: Fix crash on deferred app launch.

This fixes regression due recent shelf refactoring when meaning
of TYPE_APP AND TYPE_SHORTCUT_APP was changed. ARC defered
launcher is allowed only over shortcuts.

TEST=Manually
BUG=701152
TBR=msw@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2747983002
Cr-Commit-Position: refs/heads/master@{#456830}
(cherry picked from commit b1a39b125d0cc6b6994b92089ebc877b693a6ddd)
==========

[khmel, 2017-03-17 18:06:13]

khmel@chromium.org changed reviewers:
- msw@chromium.org

[khmel, 2017-03-17 18:14:19]

The CQ bit was checked by khmel@chromium.org

[commit-bot: I haz the power, 2017-03-17 18:15:05]

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-03-17 18:34:31]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1489774459789470,
"parent_rev": "72d4a9b5ceda4f5cca9c8c91101d92ed051c6b08", "commit_rev":
"92716b1689b94ce7c3edf5facdf858c35fa50766"}

[commit-bot: I haz the power, 2017-03-17 18:35:33]

Description was changed from

==========
[Merge M58] arc: Fix crash on deferred app launch.

This fixes regression due recent shelf refactoring when meaning
of TYPE_APP AND TYPE_SHORTCUT_APP was changed. ARC defered
launcher is allowed only over shortcuts.

TEST=Manually
BUG=701152
TBR=msw@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2747983002
Cr-Commit-Position: refs/heads/master@{#456830}
(cherry picked from commit b1a39b125d0cc6b6994b92089ebc877b693a6ddd)
==========

to

==========
[Merge M58] arc: Fix crash on deferred app launch.

This fixes regression due recent shelf refactoring when meaning
of TYPE_APP AND TYPE_SHORTCUT_APP was changed. ARC defered
launcher is allowed only over shortcuts.

TEST=Manually
BUG=701152
TBR=msw@chromium.org
NOTRY=true
NOPRESUBMIT=true

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

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

[commit-bot: I haz the power, 2017-03-17 18:35:34]

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