Moves definitions of RootWindowController into root_window_controller.cc

Moves definitions of RootWindowController into root_window_controller.cc

As part of this I made sure the definitions and declarations matched
up. This resulted in reordering a couple of things. In addition the
only other non-move I did was moving what was CreateLayoutManagers()
into InitLayoutManagers() and CloseChildWindowsImpl() into
CloseChildWindows().

BUG=671246
TEST=none
R=jamescook@chromium.org

Review-Url: https://codereview.chromium.org/2628973002
Cr-Original-Commit-Position: refs/heads/master@{#443109}
Committed: https://chromium.googlesource.com/chromium/src/+/d20a89e7b56ad53a58f19edf4775528d066577d5
Review-Url: https://codereview.chromium.org/2628973002
Cr-Commit-Position: refs/heads/master@{#443166}
Committed: https://chromium.googlesource.com/chromium/src/+/0fbb8cde3b9aa70029c2ceb9b492b446675f1877

[James Cook, 2017-01-11 22:44:49]

LGTM with nit

https://codereview.chromium.org/2628973002/diff/1/ash/root_window_controller.cc
File ash/root_window_controller.cc (right):

https://codereview.chromium.org/2628973002/diff/1/ash/root_window_controller....
ash/root_window_controller.cc:374: void RootWindowController::ShowShelf() {
FYI I have a CL that deletes this method. We'll see who lands first.

https://codereview.chromium.org/2628973002/diff/1/ash/root_window_controller....
ash/root_window_controller.cc:548:
GetRootWindowSettings(root_window)->controller = NULL;
nit: if you're touching the lines, convert NULL to nullptr

(and below)

[sky, 2017-01-12 00:01:01]

The CQ bit was checked by sky@chromium.org

[sky, 2017-01-12 00:01:02]

The patchset sent to the CQ was uploaded after l-g-t-m from
jamescook@chromium.org
Link to the patchset: https://codereview.chromium.org/2628973002/#ps20001
(title: "merge and feedback")

[sky, 2017-01-12 00:01:19]

https://codereview.chromium.org/2628973002/diff/1/ash/root_window_controller.cc
File ash/root_window_controller.cc (right):

https://codereview.chromium.org/2628973002/diff/1/ash/root_window_controller....
ash/root_window_controller.cc:374: void RootWindowController::ShowShelf() {
On 2017/01/11 22:44:48, James Cook wrote:
> FYI I have a CL that deletes this method. We'll see who lands first.

Done.

[commit-bot: I haz the power, 2017-01-12 00:03:13]

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-01-12 01:28:40]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1484179261883090,
"parent_rev": "2b7b8dafe5412ef81b6c4755bdbf700bd55d138a", "commit_rev":
"d20a89e7b56ad53a58f19edf4775528d066577d5"}

[commit-bot: I haz the power, 2017-01-12 01:29:08]

Description was changed from

==========
Moves definitions of RootWindowController into root_window_controller.cc

As part of this I made sure the definitions and declarations matched
up. This resulted in reordering a couple of things. In addition the
only other non-move I did was moving what was CreateLayoutManagers()
into InitLayoutManagers() and CloseChildWindowsImpl() into
CloseChildWindows().

BUG=671246
TEST=none
R=jamescook@chromium.org
==========

to

==========
Moves definitions of RootWindowController into root_window_controller.cc

As part of this I made sure the definitions and declarations matched
up. This resulted in reordering a couple of things. In addition the
only other non-move I did was moving what was CreateLayoutManagers()
into InitLayoutManagers() and CloseChildWindowsImpl() into
CloseChildWindows().

BUG=671246
TEST=none
R=jamescook@chromium.org

Review-Url: https://codereview.chromium.org/2628973002
Cr-Commit-Position: refs/heads/master@{#443109}
Committed:
https://chromium.googlesource.com/chromium/src/+/d20a89e7b56ad53a58f19edf4775...
==========

[commit-bot: I haz the power, 2017-01-12 01:29:09]

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

[findit-for-me, 2017-01-12 01:51:14]

FYI: Findit identified this CL at revision 443109 as the culprit for
failures in the build cycles as shown on:
https://findit-for-me.appspot.com/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3Itb...

[dschuyler, 2017-01-12 02:24:10]

A revert of this CL (patchset #2 id:20001) has been created in
https://codereview.chromium.org/2623393002/ by dschuyler@chromium.org.

The reason for reverting is: Attempting to resolve error in 
https://uberchromegw.corp.google.com/i/chromium.chromiumos/builders/ChromiumO...

>On 2017/01/11 22:44:48, James Cook wrote:
>> FYI I have a CL that deletes this method. We'll see who lands first.
> Done.

It looks like jamescook@ committed a bit more than four minutes earlier.
-- sheriff..

[ynovikov, 2017-01-12 02:24:26]

On 2017/01/12 01:51:14, findit-for-me wrote:
> FYI: Findit identified this CL at revision 443109 as the culprit for
> failures in the build cycles as shown on:
>
https://findit-for-me.appspot.com/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3Itb...

This conflicts with https://codereview.chromium.org/2625733003

[sky, 2017-01-12 03:53:26]

Description was changed from

==========
Moves definitions of RootWindowController into root_window_controller.cc

As part of this I made sure the definitions and declarations matched
up. This resulted in reordering a couple of things. In addition the
only other non-move I did was moving what was CreateLayoutManagers()
into InitLayoutManagers() and CloseChildWindowsImpl() into
CloseChildWindows().

BUG=671246
TEST=none
R=jamescook@chromium.org

Review-Url: https://codereview.chromium.org/2628973002
Cr-Commit-Position: refs/heads/master@{#443109}
Committed:
https://chromium.googlesource.com/chromium/src/+/d20a89e7b56ad53a58f19edf4775...
==========

to

==========
Moves definitions of RootWindowController into root_window_controller.cc

As part of this I made sure the definitions and declarations matched
up. This resulted in reordering a couple of things. In addition the
only other non-move I did was moving what was CreateLayoutManagers()
into InitLayoutManagers() and CloseChildWindowsImpl() into
CloseChildWindows().

BUG=671246
TEST=none
R=jamescook@chromium.org

Review-Url: https://codereview.chromium.org/2628973002
Cr-Commit-Position: refs/heads/master@{#443109}
Committed:
https://chromium.googlesource.com/chromium/src/+/d20a89e7b56ad53a58f19edf4775...
==========

[sky, 2017-01-12 04:01:58]

On 2017/01/12 02:24:26, ynovikov wrote:
> On 2017/01/12 01:51:14, findit-for-me wrote:
> > FYI: Findit identified this CL at revision 443109 as the culprit for
> > failures in the build cycles as shown on:
> >
>
https://findit-for-me.appspot.com/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3Itb...
> 
> This conflicts with https://codereview.chromium.org/2625733003

I'm going to reland as all the offending patches were reverted, so that my patch
applies cleanly again. Will ping James to make sure we don't land at the exact
same time again.

[sky, 2017-01-12 04:02:04]

The CQ bit was checked by sky@chromium.org

[sky, 2017-01-12 04:02:04]

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

[commit-bot: I haz the power, 2017-01-12 04:02:18]

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-01-12 06:07:58]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1484193724354380,
"parent_rev": "904b7a6f6dffa9cee5ac930c37dd591c330d14c6", "commit_rev":
"0fbb8cde3b9aa70029c2ceb9b492b446675f1877"}

[commit-bot: I haz the power, 2017-01-12 06:09:13]

Description was changed from

==========
Moves definitions of RootWindowController into root_window_controller.cc

As part of this I made sure the definitions and declarations matched
up. This resulted in reordering a couple of things. In addition the
only other non-move I did was moving what was CreateLayoutManagers()
into InitLayoutManagers() and CloseChildWindowsImpl() into
CloseChildWindows().

BUG=671246
TEST=none
R=jamescook@chromium.org

Review-Url: https://codereview.chromium.org/2628973002
Cr-Commit-Position: refs/heads/master@{#443109}
Committed:
https://chromium.googlesource.com/chromium/src/+/d20a89e7b56ad53a58f19edf4775...
==========

to

==========
Moves definitions of RootWindowController into root_window_controller.cc

As part of this I made sure the definitions and declarations matched
up. This resulted in reordering a couple of things. In addition the
only other non-move I did was moving what was CreateLayoutManagers()
into InitLayoutManagers() and CloseChildWindowsImpl() into
CloseChildWindows().

BUG=671246
TEST=none
R=jamescook@chromium.org

Review-Url: https://codereview.chromium.org/2628973002
Cr-Original-Commit-Position: refs/heads/master@{#443109}
Committed:
https://chromium.googlesource.com/chromium/src/+/d20a89e7b56ad53a58f19edf4775...
Review-Url: https://codereview.chromium.org/2628973002
Cr-Commit-Position: refs/heads/master@{#443166}
Committed:
https://chromium.googlesource.com/chromium/src/+/0fbb8cde3b9aa70029c2ceb9b492...
==========

[commit-bot: I haz the power, 2017-01-12 06:09:16]

Committed patchset #3 (id:40001) as
https://chromium.googlesource.com/chromium/src/+/0fbb8cde3b9aa70029c2ceb9b492...

[James Cook, 2017-01-12 06:30:39]

On 2017/01/12 06:09:16, commit-bot: I haz the power wrote:
> Committed patchset #3 (id:40001) as
>
https://chromium.googlesource.com/chromium/src/+/0fbb8cde3b9aa70029c2ceb9b492...

Now that sky has landed I'll start landing mine. I've resolved the conflict with
this patch.