Moves mash/wm into ash/mus

Moves mash/wm into ash/mus

Namespaces have been updated as well. Unfortunately this necessitated
::mus in lots of places.

BUG=616265
TEST=none
R=msw@chromium.org
TBR=ben@chromium.org

Committed: https://crrev.com/002ba4adea99e661667843282aaf3c6e64a825d3
Cr-Commit-Position: refs/heads/master@{#397569}

[sky, 2016-06-02 01:55:02]

Description was changed from

==========
Moves mash/wm into ash/mus

Namespaces have been updated as well. Unfortunately this necessitated
::mus in lots of places.

BUG=616265
TEST=none
R=msw@chromium.org
==========

to

==========
Moves mash/wm into ash/mus

Namespaces have been updated as well. Unfortunately this necessitated
::mus in lots of places.

BUG=616265
TEST=none
R=msw@chromium.org
==========

[sky, 2016-06-02 01:55:03]

sky@chromium.org changed reviewers:
+ ben@chromium.org, thakis@chromium.org

[sky, 2016-06-02 01:55:34]

thakis: tools
ben: services
msw: the rest (sorry)

[sky, 2016-06-02 01:56:18]

I also plan on renaming desktop_wm to ash, but will do that later.

[Ben Goodger (Google), 2016-06-02 17:50:53]

https://codereview.chromium.org/2029883002/diff/60001/services/navigation/BUI...
File services/navigation/BUILD.gn (right):

https://codereview.chromium.org/2029883002/diff/60001/services/navigation/BUI...
services/navigation/BUILD.gn:43: "//ash/mus",
this should just depend on the test wm, not mash

[Nico, 2016-06-02 17:51:52]

tools/ lgtm

[sky, 2016-06-02 18:09:53]

https://codereview.chromium.org/2029883002/diff/60001/services/navigation/BUI...
File services/navigation/BUILD.gn (right):

https://codereview.chromium.org/2029883002/diff/60001/services/navigation/BUI...
services/navigation/BUILD.gn:43: "//ash/mus",
On 2016/06/02 17:50:53, Ben Goodger (Google) wrote:
> this should just depend on the test wm, not mash

Done.

[msw, 2016-06-02 20:28:35]

The binary diffs appear broken, but I assume they moved fine. Mostly nits, just
worried about your TODO before landing.

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/BUILD.gn
File ash/mus/BUILD.gn (right):

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/BUILD.gn#newcod...
ash/mus/BUILD.gn:111: output_name = "desktop_wm"
We probably ought to rename this sometime... not now.

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/frame/move_even...
File ash/mus/frame/move_event_handler.cc (right):

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/frame/move_even...
ash/mus/frame/move_event_handler.cc:8: #include "ash/mus/bridge/wm_window_mus.h"
nit: remove duplicate include.

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/root_window_con...
File ash/mus/root_window_controller.cc (right):

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/root_window_con...
ash/mus/root_window_controller.cc:310: // WorkspaceLayoutManager is not a
mash::wm::LayoutManager (it's an
nit: s/an/a/

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/shadow.cc
File ash/mus/shadow.cc (right):

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/shadow.cc#newco...
ash/mus/shadow.cc:38: int GetShadowApertureForStyle(mus::Shadow::Style style) {
idle q: I wonder why this doesn't require the global :: prefix...

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/test/wm_test_he...
File ash/mus/test/wm_test_helper.cc (right):

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/test/wm_test_he...
ash/mus/test/wm_test_helper.cc:10: #include "ash/mus/window_manager.h"
nit: remove duplicate include.

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/user_window_con...
File ash/mus/user_window_controller_impl.cc (right):

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/user_window_con...
ash/mus/user_window_controller_impl.cc:7: #include <stdint.h>
q: why is this neeeded? (trying to fix your TODO below?)

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/user_window_con...
ash/mus/user_window_controller_impl.cc:19: // TODO(sky): figure out why this
generates a complie time error.
Should this be fixed before landing? (will it break window properties?)

https://codereview.chromium.org/2029883002/diff/80001/mash/BUILD.gn
File mash/BUILD.gn (right):

https://codereview.chromium.org/2029883002/diff/80001/mash/BUILD.gn#newcode54
mash/BUILD.gn:54: "//ash/mus:resources",
q: Is this really needed in deps and data_deps?

[sky, 2016-06-02 21:31:34]

Description was changed from

==========
Moves mash/wm into ash/mus

Namespaces have been updated as well. Unfortunately this necessitated
::mus in lots of places.

BUG=616265
TEST=none
R=msw@chromium.org
==========

to

==========
Moves mash/wm into ash/mus

Namespaces have been updated as well. Unfortunately this necessitated
::mus in lots of places.

BUG=616265
TEST=none
R=msw@chromium.org
TBR=ben@chromium.org
==========

[sky, 2016-06-02 21:31:51]

Ben, I'm going to TBR you for the service change.

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/BUILD.gn
File ash/mus/BUILD.gn (right):

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/BUILD.gn#newcod...
ash/mus/BUILD.gn:111: output_name = "desktop_wm"
On 2016/06/02 20:28:34, msw wrote:
> We probably ought to rename this sometime... not now.

Yep. I plan on renaming to ash.

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/frame/move_even...
File ash/mus/frame/move_event_handler.cc (right):

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/frame/move_even...
ash/mus/frame/move_event_handler.cc:8: #include "ash/mus/bridge/wm_window_mus.h"
On 2016/06/02 20:28:34, msw wrote:
> nit: remove duplicate include.

Done.

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/root_window_con...
File ash/mus/root_window_controller.cc (right):

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/root_window_con...
ash/mus/root_window_controller.cc:310: // WorkspaceLayoutManager is not a
mash::wm::LayoutManager (it's an
On 2016/06/02 20:28:34, msw wrote:
> nit: s/an/a/

Done.

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/shadow.cc
File ash/mus/shadow.cc (right):

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/shadow.cc#newco...
ash/mus/shadow.cc:38: int GetShadowApertureForStyle(mus::Shadow::Style style) {
On 2016/06/02 20:28:34, msw wrote:
> idle q: I wonder why this doesn't require the global :: prefix...

Shadow is defined in ash/mus/shadow.h, in ash::mus::Shadow. So that mus:: here
isn't necessary at all. Updated.

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/test/wm_test_he...
File ash/mus/test/wm_test_helper.cc (right):

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/test/wm_test_he...
ash/mus/test/wm_test_helper.cc:10: #include "ash/mus/window_manager.h"
On 2016/06/02 20:28:34, msw wrote:
> nit: remove duplicate include.

Done.

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/user_window_con...
File ash/mus/user_window_controller_impl.cc (right):

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/user_window_con...
ash/mus/user_window_controller_impl.cc:7: #include <stdint.h>
On 2016/06/02 20:28:35, msw wrote:
> q: why is this neeeded? (trying to fix your TODO below?)

Indeed. I had thought it might be necessary to fix the TODO below, but it
doesn't matter. Removed.

https://codereview.chromium.org/2029883002/diff/80001/ash/mus/user_window_con...
ash/mus/user_window_controller_impl.cc:19: // TODO(sky): figure out why this
generates a complie time error.
On 2016/06/02 20:28:35, msw wrote:
> Should this be fixed before landing? (will it break window properties?)

It compiled fine without this. But I ended up reverting the changes to
components/mus/public/cpp/window_property and moving the MUS_DEFINE outside of
ash::mus namespace. There was some weird collision with ash::mus and mus:: in
window_property that I could not seem to get working correctly. No doubt some
weird template specialization issue.

https://codereview.chromium.org/2029883002/diff/80001/mash/BUILD.gn
File mash/BUILD.gn (right):

https://codereview.chromium.org/2029883002/diff/80001/mash/BUILD.gn#newcode54
mash/BUILD.gn:54: "//ash/mus:resources",
On 2016/06/02 20:28:35, msw wrote:
> q: Is this really needed in deps and data_deps?

I believe so. data_deps is really only needed by the bots.

[sky, 2016-06-02 21:32:56]

The CQ bit was checked by sky@chromium.org

[sky, 2016-06-02 21:32:57]

The patchset sent to the CQ was uploaded after l-g-t-m from thakis@chromium.org
Link to the patchset: https://codereview.chromium.org/2029883002/#ps120001
(title: "move comment")

[commit-bot: I haz the power, 2016-06-02 21:33:55]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2029883002/120001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2029883002/120001

[msw, 2016-06-02 21:36:03]

lgtm

[commit-bot: I haz the power, 2016-06-03 00:56:23]

Description was changed from

==========
Moves mash/wm into ash/mus

Namespaces have been updated as well. Unfortunately this necessitated
::mus in lots of places.

BUG=616265
TEST=none
R=msw@chromium.org
TBR=ben@chromium.org
==========

to

==========
Moves mash/wm into ash/mus

Namespaces have been updated as well. Unfortunately this necessitated
::mus in lots of places.

BUG=616265
TEST=none
R=msw@chromium.org
TBR=ben@chromium.org
==========

[commit-bot: I haz the power, 2016-06-03 00:56:25]

Committed patchset #7 (id:120001)

[commit-bot: I haz the power, 2016-06-03 00:58:07]

Description was changed from

==========
Moves mash/wm into ash/mus

Namespaces have been updated as well. Unfortunately this necessitated
::mus in lots of places.

BUG=616265
TEST=none
R=msw@chromium.org
TBR=ben@chromium.org
==========

to

==========
Moves mash/wm into ash/mus

Namespaces have been updated as well. Unfortunately this necessitated
::mus in lots of places.

BUG=616265
TEST=none
R=msw@chromium.org
TBR=ben@chromium.org

Committed: https://crrev.com/002ba4adea99e661667843282aaf3c6e64a825d3
Cr-Commit-Position: refs/heads/master@{#397569}
==========

[commit-bot: I haz the power, 2016-06-03 00:58:09]

Patchset 7 (id:??) landed as
https://crrev.com/002ba4adea99e661667843282aaf3c6e64a825d3
Cr-Commit-Position: refs/heads/master@{#397569}