mash: Migrate ShellDelegate ownership and access to WmShell.

mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Port and use ShellDelegateMus in ash::mus::WindowManager::Init?
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org
TBR=sky@chromium.org,yusukes@chromium.org

Committed: https://crrev.com/0414d41295a36b35a9fca54a993b0b56a60ddacf
Cr-Commit-Position: refs/heads/master@{#403964}

[msw, 2016-07-06 19:52:19]

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

[commit-bot: I haz the power, 2016-07-06 19:53:02]

Dry run: 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, 2016-07-06 20:28:04]

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

[commit-bot: I haz the power, 2016-07-06 20:28:05]

Dry run: Try jobs failed on following builders:
  win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)
  win_chromium_x64_rel_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)

[msw, 2016-07-06 20:38:06]

Description was changed from

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

BUG=619636
==========

to

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Instantiate and use ShellDelegateMus in mash (now null).
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org
==========

[msw, 2016-07-06 20:38:07]

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

[msw, 2016-07-06 20:44:13]

Description was changed from

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Instantiate and use ShellDelegateMus in mash (now null).
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org
==========

to

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Use ShellDelegateMus in ash::mus::WindowManager::Init?
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org
==========

[msw, 2016-07-06 20:44:21]

Patchset #4 (id:60001) has been deleted

[msw, 2016-07-06 20:44:33]

Patchset #4 (id:80001) has been deleted

[msw, 2016-07-06 20:45:35]

Description was changed from

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Use ShellDelegateMus in ash::mus::WindowManager::Init?
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org
==========

to

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Port and use ShellDelegateMus in ash::mus::WindowManager::Init?
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org
==========

[msw, 2016-07-06 20:46:20]

Hey James, please take a look; thanks!
(lmk if you're busy and I should ping Scott instead)

[msw, 2016-07-06 20:46:28]

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

[commit-bot: I haz the power, 2016-07-06 20:47:18]

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

[James Cook, 2016-07-06 21:27:28]

https://codereview.chromium.org/2118593002/diff/100001/ash/common/wm_shell.h
File ash/common/wm_shell.h (right):

https://codereview.chromium.org/2118593002/diff/100001/ash/common/wm_shell.h#...
ash/common/wm_shell.h:16: #include "ash/common/shell_delegate.h"
Can this be forward declared? wm_shell.h is widely included, so it would be nice
if it didn't have too many sub-includes.

https://codereview.chromium.org/2118593002/diff/100001/ash/common/wm_shell.h#...
ash/common/wm_shell.h:224: void DeleteShellDelegate();
I don't see this called in your CL.

https://codereview.chromium.org/2118593002/diff/100001/ash/mus/window_manager.cc
File ash/mus/window_manager.cc (right):

https://codereview.chromium.org/2118593002/diff/100001/ash/mus/window_manager...
ash/mus/window_manager.cc:71: shell_.reset(new WmShellMus(nullptr,
window_tree_client_));
Put a TODO here explaining that the nullptr is the delegate and will need to be
fixed.

https://codereview.chromium.org/2118593002/diff/100001/ash/shell.cc
File ash/shell.cc (right):

https://codereview.chromium.org/2118593002/diff/100001/ash/shell.cc#newcode604
ash/shell.cc:604: : wm_shell_(new WmShellAura(delegate)),
It's nice that it works to move this here!

https://codereview.chromium.org/2118593002/diff/100001/ash/shell.cc#newcode1021
ash/shell.cc:1021: wm_shell_->SetMediaDelegate(
Could the media delegate be created inside WmShell?

https://codereview.chromium.org/2118593002/diff/100001/ash/shell.cc#newcode1030
ash/shell.cc:1030:
base::WrapUnique(wm_shell_->delegate()->CreateSystemTrayDelegate()));
ditto

https://codereview.chromium.org/2118593002/diff/100001/ash/system/user/tray_u...
File ash/system/user/tray_user_unittest.cc (right):

https://codereview.chromium.org/2118593002/diff/100001/ash/system/user/tray_u...
ash/system/user/tray_user_unittest.cc:12: #include "ash/shell.h"
remove?

[commit-bot: I haz the power, 2016-07-06 21:27:28]

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

[commit-bot: I haz the power, 2016-07-06 21:27:29]

Dry run: This issue passed the CQ dry run.

[msw, 2016-07-06 21:57:08]

Description was changed from

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Port and use ShellDelegateMus in ash::mus::WindowManager::Init?
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org
==========

to

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Port and use ShellDelegateMus in ash::mus::WindowManager::Init?
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org,sky@chromium.org,yusukes@chromium.org
==========

[msw, 2016-07-06 21:57:08]

msw@chromium.org changed reviewers:
+ sky@chromium.org, yusukesuzuki@chromium.org

[msw, 2016-07-06 21:58:19]

msw@chromium.org changed reviewers:
+ yusukes@chromium.org
- yusukesuzuki@chromium.org

[msw, 2016-07-06 21:58:56]

+sky@ for chrome/*, yusukes@ for components/arc/*

https://codereview.chromium.org/2118593002/diff/100001/ash/common/wm_shell.h
File ash/common/wm_shell.h (right):

https://codereview.chromium.org/2118593002/diff/100001/ash/common/wm_shell.h#...
ash/common/wm_shell.h:16: #include "ash/common/shell_delegate.h"
On 2016/07/06 21:27:27, James Cook wrote:
> Can this be forward declared? wm_shell.h is widely included, so it would be
nice
> if it didn't have too many sub-includes.

Done.

https://codereview.chromium.org/2118593002/diff/100001/ash/common/wm_shell.h#...
ash/common/wm_shell.h:224: void DeleteShellDelegate();
On 2016/07/06 21:27:27, James Cook wrote:
> I don't see this called in your CL.

Removed.

https://codereview.chromium.org/2118593002/diff/100001/ash/mus/window_manager.cc
File ash/mus/window_manager.cc (right):

https://codereview.chromium.org/2118593002/diff/100001/ash/mus/window_manager...
ash/mus/window_manager.cc:71: shell_.reset(new WmShellMus(nullptr,
window_tree_client_));
On 2016/07/06 21:27:27, James Cook wrote:
> Put a TODO here explaining that the nullptr is the delegate and will need to
be
> fixed.

Done.

https://codereview.chromium.org/2118593002/diff/100001/ash/shell.cc
File ash/shell.cc (right):

https://codereview.chromium.org/2118593002/diff/100001/ash/shell.cc#newcode604
ash/shell.cc:604: : wm_shell_(new WmShellAura(delegate)),
On 2016/07/06 21:27:27, James Cook wrote:
> It's nice that it works to move this here!

Acknowledged.

https://codereview.chromium.org/2118593002/diff/100001/ash/shell.cc#newcode1021
ash/shell.cc:1021: wm_shell_->SetMediaDelegate(
On 2016/07/06 21:27:27, James Cook wrote:
> Could the media delegate be created inside WmShell?

Yes, all of these other delegates should be created and owned by WmShell; some
would be straightforward to move now, but I think it'd make sense to leave them
for followup CLs.

https://codereview.chromium.org/2118593002/diff/100001/ash/shell.cc#newcode1030
ash/shell.cc:1030:
base::WrapUnique(wm_shell_->delegate()->CreateSystemTrayDelegate()));
On 2016/07/06 21:27:27, James Cook wrote:
> ditto

See comment above.

https://codereview.chromium.org/2118593002/diff/100001/ash/system/user/tray_u...
File ash/system/user/tray_user_unittest.cc (right):

https://codereview.chromium.org/2118593002/diff/100001/ash/system/user/tray_u...
ash/system/user/tray_user_unittest.cc:12: #include "ash/shell.h"
On 2016/07/06 21:27:27, James Cook wrote:
> remove?

Used for GetPrimaryRootWindow[Controller]; I'll leave this for followup.

[James Cook, 2016-07-06 22:04:21]

LGTM

[msw, 2016-07-06 22:05:58]

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

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

Dry run: 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, 2016-07-06 22:47:17]

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

[commit-bot: I haz the power, 2016-07-06 22:47:19]

Dry run: This issue passed the CQ dry run.

[msw, 2016-07-06 22:50:18]

Description was changed from

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Port and use ShellDelegateMus in ash::mus::WindowManager::Init?
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org,sky@chromium.org,yusukes@chromium.org
==========

to

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Port and use ShellDelegateMus in ash::mus::WindowManager::Init?
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org
TBR=sky@chromium.org,yusukes@chromium.org
==========

[msw, 2016-07-06 22:50:52]

TBR'ing sky@ and yusukes@ for fairly mechanical changes.

[msw, 2016-07-06 22:51:00]

The CQ bit was checked by msw@chromium.org

[commit-bot: I haz the power, 2016-07-06 22:52:03]

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, 2016-07-06 22:59:03]

Description was changed from

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Port and use ShellDelegateMus in ash::mus::WindowManager::Init?
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org
TBR=sky@chromium.org,yusukes@chromium.org
==========

to

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Port and use ShellDelegateMus in ash::mus::WindowManager::Init?
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org
TBR=sky@chromium.org,yusukes@chromium.org
==========

[commit-bot: I haz the power, 2016-07-06 22:59:05]

Committed patchset #5 (id:120001)

[commit-bot: I haz the power, 2016-07-06 22:59:26]

CQ bit was unchecked.

[commit-bot: I haz the power, 2016-07-06 23:01:06]

Description was changed from

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Port and use ShellDelegateMus in ash::mus::WindowManager::Init?
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org
TBR=sky@chromium.org,yusukes@chromium.org
==========

to

==========
mash: Migrate ShellDelegate ownership and access to WmShell.

Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)

TODO: Port and use ShellDelegateMus in ash::mus::WindowManager::Init?
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h

BUG=619636
TEST=Compiles; unit tests; no behavior changes.
R=jamescook@chromium.org
TBR=sky@chromium.org,yusukes@chromium.org

Committed: https://crrev.com/0414d41295a36b35a9fca54a993b0b56a60ddacf
Cr-Commit-Position: refs/heads/master@{#403964}
==========

[commit-bot: I haz the power, 2016-07-06 23:01:08]

Patchset 5 (id:??) landed as
https://crrev.com/0414d41295a36b35a9fca54a993b0b56a60ddacf
Cr-Commit-Position: refs/heads/master@{#403964}