mash: Move wm_shelf_types.h into shelf_types.h

mash: Move wm_shelf_types.h into shelf_types.h

Cleanup from https://codereview.chromium.org/2036353002/ done separately to
preserve history.

BUG=615155
TEST=compiles

Committed: https://crrev.com/a8c9261aa653751d108271b8c15938d78783c692
Cr-Commit-Position: refs/heads/master@{#397909}

[James Cook, 2016-06-03 21:08:59]

jamescook@chromium.org changed reviewers:
+ sky@chromium.org

[James Cook, 2016-06-03 21:09:00]

sky, please take a look.

[sky, 2016-06-03 22:31:54]

LGTM

[James Cook, 2016-06-04 06:20:35]

The CQ bit was checked by jamescook@chromium.org

[James Cook, 2016-06-04 06:20:35]

The patchset sent to the CQ was uploaded after l-g-t-m from sky@chromium.org
Link to the patchset: https://codereview.chromium.org/2032253003/#ps20001
(title: "Rebase")

[commit-bot: I haz the power, 2016-06-04 06:20:48]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2032253003/20001

[commit-bot: I haz the power, 2016-06-04 07:37:05]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-06-04 07:39:04]

Description was changed from

==========
mash: Move wm_shelf_types.h into shelf_types.h

Cleanup from https://codereview.chromium.org/2036353002/ done separately to
preserve history.

BUG=615155
TEST=compiles
==========

to

==========
mash: Move wm_shelf_types.h into shelf_types.h

Cleanup from https://codereview.chromium.org/2036353002/ done separately to
preserve history.

BUG=615155
TEST=compiles

Committed: https://crrev.com/a8c9261aa653751d108271b8c15938d78783c692
Cr-Commit-Position: refs/heads/master@{#397909}
==========

[commit-bot: I haz the power, 2016-06-04 07:39:05]

Patchset 2 (id:??) landed as
https://crrev.com/a8c9261aa653751d108271b8c15938d78783c692
Cr-Commit-Position: refs/heads/master@{#397909}