mash: Convert TrayBackgroundView to wm common types

mash: Convert TrayBackgroundView to wm common types

Also convert StatusAreaWidget usage to WmShelf. This is closer to the long-
term pattern we want, where StatusAreaWidget is accessed via wm types.

* Eliminate the TrayBackgroundView::status_area_widget() accessors
* Cache a copy of StatusAreaWidget* in subclasses where needed

Move the following interdependent files:
move_source_file.py ash/system/tray/tray_background_view.* ash/common/system/tray/
move_source_file.py ash/system/tray/tray_bubble_wrapper.* ash/common/system/tray/
move_source_file.py ash/system/tray/tray_event_filter.* ash/common/system/tray/
move_source_file.py ash/system/tray/system_tray_bubble.* ash/common/system/tray/

BUG=619636
TEST=ash_unittests
TBR=stevenjb@chromium.org for 1 line rename in c/b/ui/chromeos/

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

[James Cook, 2016-06-23 21:26:19]

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

[James Cook, 2016-06-23 21:26:19]

msw, please take a look.

[James Cook, 2016-06-23 21:30:14]

Actually, hold off a minute, I think I can move the files in this CL.

[James Cook, 2016-06-23 21:44:51]

Description was changed from

==========
mash: Convert TrayBackgroundView to wm common types

Also convert StatusAreaWidget usage to WmShelf. This is closer to the long-
term pattern we want, where StatusAreaWidget is accessed via wm types.

This doesn't move the file because of interdependencies between this class,
SystemTray and TrayEventFilter.

BUG=619636
TEST=ash_unittests
==========

to

==========
mash: Convert TrayBackgroundView to wm common types

Also convert StatusAreaWidget usage to WmShelf. This is closer to the long-
term pattern we want, where StatusAreaWidget is accessed via wm types.

* Eliminate the TrayBackgroundView::status_area_widget() accessors
* Cache a copy of StatusAreaWidget* in subclasses where needed

Move the following interdependent files:
move_source_file.py ash/system/tray/tray_background_view.*
ash/common/system/tray/
move_source_file.py ash/system/tray/tray_bubble_wrapper.*
ash/common/system/tray/
move_source_file.py ash/system/tray/tray_event_filter.* ash/common/system/tray/
move_source_file.py ash/system/tray/system_tray_bubble.* ash/common/system/tray/

BUG=619636
TEST=ash_unittests
==========

[James Cook, 2016-06-23 21:45:17]

msw, *now* please take a look. :-)

I updated the CL description too.

[msw, 2016-06-23 22:17:27]

lgtm

https://codereview.chromium.org/2091933002/diff/40001/ash/system/tray/system_...
File ash/system/tray/system_tray.h (right):

https://codereview.chromium.org/2091933002/diff/40001/ash/system/tray/system_...
ash/system/tray/system_tray.h:216: StatusAreaWidget* status_area_widget_;
nit: comment

https://codereview.chromium.org/2091933002/diff/40001/ash/system/tray/system_...
File ash/system/tray/system_tray_bubble.cc (left):

https://codereview.chromium.org/2091933002/diff/40001/ash/system/tray/system_...
ash/system/tray/system_tray_bubble.cc:1: // Copyright (c) 2012 The Chromium
Authors. All rights reserved.
odd that some files are marked modified, not deleted.

https://codereview.chromium.org/2091933002/diff/40001/ash/system/web_notifica...
File ash/system/web_notification/web_notification_tray.cc (right):

https://codereview.chromium.org/2091933002/diff/40001/ash/system/web_notifica...
ash/system/web_notification/web_notification_tray.cc:15: #include
"ash/common/system/tray/tray_background_view.h"
nit: not needed (included by header)

[James Cook, 2016-06-23 22:44:18]

Thanks for the review.

https://codereview.chromium.org/2091933002/diff/40001/ash/system/tray/system_...
File ash/system/tray/system_tray.h (right):

https://codereview.chromium.org/2091933002/diff/40001/ash/system/tray/system_...
ash/system/tray/system_tray.h:216: StatusAreaWidget* status_area_widget_;
On 2016/06/23 22:17:27, msw wrote:
> nit: comment

Done.

https://codereview.chromium.org/2091933002/diff/40001/ash/system/tray/system_...
File ash/system/tray/system_tray_bubble.cc (left):

https://codereview.chromium.org/2091933002/diff/40001/ash/system/tray/system_...
ash/system/tray/system_tray_bubble.cc:1: // Copyright (c) 2012 The Chromium
Authors. All rights reserved.
On 2016/06/23 22:17:26, msw wrote:
> odd that some files are marked modified, not deleted.

Yeah, that's weird. Reitveld clearly sees the move, since the new locations are
"A +", but I don't know why these are modified.

https://codereview.chromium.org/2091933002/diff/40001/ash/system/web_notifica...
File ash/system/web_notification/web_notification_tray.cc (right):

https://codereview.chromium.org/2091933002/diff/40001/ash/system/web_notifica...
ash/system/web_notification/web_notification_tray.cc:15: #include
"ash/common/system/tray/tray_background_view.h"
On 2016/06/23 22:17:27, msw wrote:
> nit: not needed (included by header)

Done.

[James Cook, 2016-06-23 22:44:47]

Description was changed from

==========
mash: Convert TrayBackgroundView to wm common types

Also convert StatusAreaWidget usage to WmShelf. This is closer to the long-
term pattern we want, where StatusAreaWidget is accessed via wm types.

* Eliminate the TrayBackgroundView::status_area_widget() accessors
* Cache a copy of StatusAreaWidget* in subclasses where needed

Move the following interdependent files:
move_source_file.py ash/system/tray/tray_background_view.*
ash/common/system/tray/
move_source_file.py ash/system/tray/tray_bubble_wrapper.*
ash/common/system/tray/
move_source_file.py ash/system/tray/tray_event_filter.* ash/common/system/tray/
move_source_file.py ash/system/tray/system_tray_bubble.* ash/common/system/tray/

BUG=619636
TEST=ash_unittests
==========

to

==========
mash: Convert TrayBackgroundView to wm common types

Also convert StatusAreaWidget usage to WmShelf. This is closer to the long-
term pattern we want, where StatusAreaWidget is accessed via wm types.

* Eliminate the TrayBackgroundView::status_area_widget() accessors
* Cache a copy of StatusAreaWidget* in subclasses where needed

Move the following interdependent files:
move_source_file.py ash/system/tray/tray_background_view.*
ash/common/system/tray/
move_source_file.py ash/system/tray/tray_bubble_wrapper.*
ash/common/system/tray/
move_source_file.py ash/system/tray/tray_event_filter.* ash/common/system/tray/
move_source_file.py ash/system/tray/system_tray_bubble.* ash/common/system/tray/

BUG=619636
TEST=ash_unittests
TBR=stevenjb@chromium.org for 1 line rename in c/b/ui/chromeos/
==========

[James Cook, 2016-06-23 22:45:22]

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

[James Cook, 2016-06-23 22:45:22]

stevenjb, I'm going to TBR you for a 1 line rename in
chrome/browser/chromeos/ui/focus_ring_controller.cc

[James Cook, 2016-06-23 22:45:29]

The CQ bit was checked by jamescook@chromium.org

[James Cook, 2016-06-23 22:45:30]

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/2091933002/#ps60001
(title: "review comments")

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

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

[commit-bot: I haz the power, 2016-06-24 01:18:13]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-06-24 01:19:33]

Description was changed from

==========
mash: Convert TrayBackgroundView to wm common types

Also convert StatusAreaWidget usage to WmShelf. This is closer to the long-
term pattern we want, where StatusAreaWidget is accessed via wm types.

* Eliminate the TrayBackgroundView::status_area_widget() accessors
* Cache a copy of StatusAreaWidget* in subclasses where needed

Move the following interdependent files:
move_source_file.py ash/system/tray/tray_background_view.*
ash/common/system/tray/
move_source_file.py ash/system/tray/tray_bubble_wrapper.*
ash/common/system/tray/
move_source_file.py ash/system/tray/tray_event_filter.* ash/common/system/tray/
move_source_file.py ash/system/tray/system_tray_bubble.* ash/common/system/tray/

BUG=619636
TEST=ash_unittests
TBR=stevenjb@chromium.org for 1 line rename in c/b/ui/chromeos/
==========

to

==========
mash: Convert TrayBackgroundView to wm common types

Also convert StatusAreaWidget usage to WmShelf. This is closer to the long-
term pattern we want, where StatusAreaWidget is accessed via wm types.

* Eliminate the TrayBackgroundView::status_area_widget() accessors
* Cache a copy of StatusAreaWidget* in subclasses where needed

Move the following interdependent files:
move_source_file.py ash/system/tray/tray_background_view.*
ash/common/system/tray/
move_source_file.py ash/system/tray/tray_bubble_wrapper.*
ash/common/system/tray/
move_source_file.py ash/system/tray/tray_event_filter.* ash/common/system/tray/
move_source_file.py ash/system/tray/system_tray_bubble.* ash/common/system/tray/

BUG=619636
TEST=ash_unittests
TBR=stevenjb@chromium.org for 1 line rename in c/b/ui/chromeos/

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

[commit-bot: I haz the power, 2016-06-24 01:19:35]

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

[piman, 2016-06-24 02:32:21]

A revert of this CL (patchset #4 id:60001) has been created in
https://codereview.chromium.org/2097733002/ by piman@chromium.org.

The reason for reverting is: Causing compile errors
- https://build.chromium.org/p/chromium/builders/Win/builds/44650

FAILED: obj/ash/ash/web_notification_tray.obj 
ninja -t msvc -e environment.x86 -- C:\b\build\slave\cache\cipd\goma/gomacc.exe
"C:\b\depot_tools\win_toolchain\vs_files\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\VC\bin\amd64_x86/cl.exe"
/nologo /showIncludes /FC @obj/ash/ash/web_notification_tray.obj.rsp /c
../../ash/system/web_notification/web_notification_tray.cc
/Foobj/ash/ash/web_notification_tray.obj /Fd"obj/ash/ash_cc.pdb"
c:\b\build\slave\win\build\src\ash\system\web_notification\web_notification_tray.cc(510):
error C3861: 'status_area_widget': identifier not found
c:\b\build\slave\win\build\src\ash\system\web_notification\web_notification_tray.cc(510):
error C2227: left of '->system_tray' must point to class/struct/union/generic
type
c:\b\build\slave\win\build\src\ash\system\web_notification\web_notification_tray.cc(510):
note: type is 'unknown-type'
c:\b\build\slave\win\build\src\ash\system\web_notification\web_notification_tray.cc(510):
error C2227: left of '->SetNextFocusableView' must point to
class/struct/union/generic type.

[dgozman, 2016-06-24 02:36:23]

A revert of this CL (patchset #4 id:60001) has been created in
https://codereview.chromium.org/2095663004/ by dgozman@chromium.org.

The reason for reverting is: Broke compile. Looks like this was conflicting with
https://chromium.googlesource.com/chromium/src/+/133c792af9dfe8c82561bee7015e...
landed just before. Broken build:
https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%....

[James Cook, 2016-06-24 02:40:39]

On 2016/06/24 02:36:23, dgozman wrote:
> A revert of this CL (patchset #4 id:60001) has been created in
> https://codereview.chromium.org/2095663004/ by mailto:dgozman@chromium.org.
> 
> The reason for reverting is: Broke compile. Looks like this was conflicting
with
>
https://chromium.googlesource.com/chromium/src/+/133c792af9dfe8c82561bee7015e...
> landed just before. Broken build:
>
https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%....

Thanks for reverting me. Looks like a collision. I'll try again in the morning.

[James Cook, 2016-06-24 04:39:13]

On 2016/06/24 02:40:39, James Cook wrote:
> On 2016/06/24 02:36:23, dgozman wrote:
> > A revert of this CL (patchset #4 id:60001) has been created in
> > https://codereview.chromium.org/2095663004/ by mailto:dgozman@chromium.org.
> > 
> > The reason for reverting is: Broke compile. Looks like this was conflicting
> with
> >
>
https://chromium.googlesource.com/chromium/src/+/133c792af9dfe8c82561bee7015e...
> > landed just before. Broken build:
> >
>
https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%....
> 
> Thanks for reverting me. Looks like a collision. I'll try again in the
morning.

Relanding with https://codereview.chromium.org/2099603002/