Merges RootWindowControllerCommon into WmRootWindowController

Merges RootWindowControllerCommon into WmRootWindowController

And some minor cleanup as a result. I left GetWorkspaceWindowState()
in WmRootWindowController as it's a bit tedious to dig it out the
WorkspaceController.

BUG=624173
TEST=covered by tests
R=msw@chromium.org

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

[sky, 2016-08-30 21:00:26]

The CQ bit was checked by sky@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-30 21:00:52]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[msw, 2016-08-30 21:26:46]

lgtm with nits

https://codereview.chromium.org/2297893002/diff/20001/ash/common/wm/maximize_...
File ash/common/wm/maximize_mode/maximize_mode_window_manager.cc (right):

https://codereview.chromium.org/2297893002/diff/20001/ash/common/wm/maximize_...
ash/common/wm/maximize_mode/maximize_mode_window_manager.cc:324:
base::WrapUnique(enable
nit: enable ? base::MakeUnique<WorkspaceBackdropDelegate>(default_container) :
nullptr

https://codereview.chromium.org/2297893002/diff/20001/ash/common/wm_root_wind...
File ash/common/wm_root_window_controller.h (right):

https://codereview.chromium.org/2297893002/diff/20001/ash/common/wm_root_wind...
ash/common/wm_root_window_controller.h:37: wm::RootWindowLayoutManager*
root_window_layout() {
nit: root_window_layout_manager? (ditto for member?)

https://codereview.chromium.org/2297893002/diff/20001/ash/mus/bridge/wm_root_...
File ash/mus/bridge/wm_root_window_controller_mus.h (right):

https://codereview.chromium.org/2297893002/diff/20001/ash/mus/bridge/wm_root_...
ash/mus/bridge/wm_root_window_controller_mus.h:65: friend class
RootWindowController;
q: is this needed?

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

https://codereview.chromium.org/2297893002/diff/20001/ash/mus/root_window_con...
ash/mus/root_window_controller.cc:58: wm_root_window_controller_ =
base::MakeUnique<WmRootWindowControllerMus>(
nit: move to initializer list?

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

https://codereview.chromium.org/2297893002/diff/20001/ash/mus/test/wm_test_he...
ash/mus/test/wm_test_helper.cc:37: window_manager_app_ =
base::MakeUnique<WindowManagerApplication>();
nit: maybe cite the reason for changing construction/destruction ordering?

https://codereview.chromium.org/2297893002/diff/20001/ash/root_window_control...
File ash/root_window_controller.h (right):

https://codereview.chromium.org/2297893002/diff/20001/ash/root_window_control...
ash/root_window_controller.h:273: // Owned by GetRootWindow().
nit: s/GetRootWindow()/the root window/ or similar?

https://codereview.chromium.org/2297893002/diff/20001/ash/root_window_control...
ash/root_window_controller.h:274: WmRootWindowControllerAura*
wm_root_window_controller_ = nullptr;
nit: avoid using the aura sublcass for the pointer here?

[commit-bot: I haz the power, 2016-08-30 21:51:34]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-30 21:51:35]

Dry run: This issue passed the CQ dry run.

[sky, 2016-08-30 21:52:53]

The CQ bit was checked by sky@chromium.org

[sky, 2016-08-30 21:52:53]

The patchset sent to the CQ was uploaded after l-g-t-m from msw@chromium.org
Link to the patchset: https://codereview.chromium.org/2297893002/#ps40001
(title: "feedback")

[commit-bot: I haz the power, 2016-08-30 21:53:18]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[sky, 2016-08-30 22:02:57]

https://codereview.chromium.org/2297893002/diff/20001/ash/common/wm/maximize_...
File ash/common/wm/maximize_mode/maximize_mode_window_manager.cc (right):

https://codereview.chromium.org/2297893002/diff/20001/ash/common/wm/maximize_...
ash/common/wm/maximize_mode/maximize_mode_window_manager.cc:324:
base::WrapUnique(enable
On 2016/08/30 21:26:46, msw wrote:
> nit: enable ? base::MakeUnique<WorkspaceBackdropDelegate>(default_container) :
> nullptr

Done.

https://codereview.chromium.org/2297893002/diff/20001/ash/common/wm_root_wind...
File ash/common/wm_root_window_controller.h (right):

https://codereview.chromium.org/2297893002/diff/20001/ash/common/wm_root_wind...
ash/common/wm_root_window_controller.h:37: wm::RootWindowLayoutManager*
root_window_layout() {
On 2016/08/30 21:26:46, msw wrote:
> nit: root_window_layout_manager? (ditto for member?)

Done.

https://codereview.chromium.org/2297893002/diff/20001/ash/mus/bridge/wm_root_...
File ash/mus/bridge/wm_root_window_controller_mus.h (right):

https://codereview.chromium.org/2297893002/diff/20001/ash/mus/bridge/wm_root_...
ash/mus/bridge/wm_root_window_controller_mus.h:65: friend class
RootWindowController;
On 2016/08/30 21:26:46, msw wrote:
> q: is this needed?

Yes, as RootWindowController calls CreateContainers (and others), which is
protected.

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

https://codereview.chromium.org/2297893002/diff/20001/ash/mus/root_window_con...
ash/mus/root_window_controller.cc:58: wm_root_window_controller_ =
base::MakeUnique<WmRootWindowControllerMus>(
On 2016/08/30 21:26:46, msw wrote:
> nit: move to initializer list?

I avoid that because of supplying 'this', but I think should be ok. Done.

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

https://codereview.chromium.org/2297893002/diff/20001/ash/mus/test/wm_test_he...
ash/mus/test/wm_test_helper.cc:37: window_manager_app_ =
base::MakeUnique<WindowManagerApplication>();
On 2016/08/30 21:26:46, msw wrote:
> nit: maybe cite the reason for changing construction/destruction ordering?

Added comment to destructor.

https://codereview.chromium.org/2297893002/diff/20001/ash/root_window_control...
File ash/root_window_controller.h (right):

https://codereview.chromium.org/2297893002/diff/20001/ash/root_window_control...
ash/root_window_controller.h:273: // Owned by GetRootWindow().
On 2016/08/30 21:26:46, msw wrote:
> nit: s/GetRootWindow()/the root window/ or similar?

Done.

https://codereview.chromium.org/2297893002/diff/20001/ash/root_window_control...
ash/root_window_controller.h:274: WmRootWindowControllerAura*
wm_root_window_controller_ = nullptr;
On 2016/08/30 21:26:46, msw wrote:
> nit: avoid using the aura sublcass for the pointer here?

It has to be Aura here so that resolution to friend works correctly. Without
this compiler sees call to WmRootWindowController->Foo(), which is different
than WmRootWindowControllerAura->Foo()

[commit-bot: I haz the power, 2016-08-30 22:37:53]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-08-30 22:40:11]

Description was changed from

==========
Merges RootWindowControllerCommon into WmRootWindowController

And some minor cleanup as a result. I left GetWorkspaceWindowState()
in WmRootWindowController as it's a bit tedious to dig it out the
WorkspaceController.

BUG=624173
TEST=covered by tests
R=msw@chromium.org
==========

to

==========
Merges RootWindowControllerCommon into WmRootWindowController

And some minor cleanup as a result. I left GetWorkspaceWindowState()
in WmRootWindowController as it's a bit tedious to dig it out the
WorkspaceController.

BUG=624173
TEST=covered by tests
R=msw@chromium.org

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

[commit-bot: I haz the power, 2016-08-30 22:40:12]

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