Re-factor Ash Message Center code part 3/4

* Make web/system trays delegates instead of bubbles.
* Move TrayBubbleWrapper to trays.
* Remove remaining ash dependencies in message_center views.

Code diagram with changes:
https://docs.google.com/drawings/d/1B6ZxXObmrDFzgWEHmkP_Ppt2BFbOL9kXzakOmY0sXe0/edit

BUG=150872
For ash/wm/gestures/tray_gesture_handler.cc:
[email protected]

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=162849

[stevenjb, 2012-10-16 00:16:29]

OK, this is the last big change. The only remaining part is moving and renaming
classes to ui/views (see linked diagram).

Thanks in advance!

[miket_OOO, 2012-10-16 01:05:42]

Very straightforward in spite of its size. LGTM!

http://codereview.chromium.org/11154022/diff/5001/ash/system/tray/system_tray.cc
File ash/system/tray/system_tray.cc (right):

http://codereview.chromium.org/11154022/diff/5001/ash/system/tray/system_tray...
ash/system/tray/system_tray.cc:68: bubble_.reset(bubble);
Could this be an initializer?

http://codereview.chromium.org/11154022/diff/5001/ash/system/tray/system_tray...
ash/system/tray/system_tray.cc:116: notification_bubble_.reset();
I don't see why these are necessary. Does the DestroyTrayView() below somehow
depend on these guys giving up the resources before it runs? If so, a comment to
the effect that the ordering is necessary might help someone who's blindly
optimizing away scoped_ptr resets in destructors.

http://codereview.chromium.org/11154022/diff/5001/ash/system/tray/tray_bubble...
File ash/system/tray/tray_bubble_view.h (right):

http://codereview.chromium.org/11154022/diff/5001/ash/system/tray/tray_bubble...
ash/system/tray/tray_bubble_view.h:10: // Specialized bubble view for bubbles
associated with a tray icon (e.g the
e.g.

http://codereview.chromium.org/11154022/diff/5001/ash/system/tray/tray_bubble...
ash/system/tray/tray_bubble_view.h:62: // accesible name for the bubble.
accessible

http://codereview.chromium.org/11154022/diff/5001/ash/system/web_notification...
File ash/system/web_notification/message_center_bubble.h (right):

http://codereview.chromium.org/11154022/diff/5001/ash/system/web_notification...
ash/system/web_notification/message_center_bubble.h:6: #define
ASH_SYSTEM_WEB_NOTIFICATION_MESSAGE_CENTER_BUBBLE_H_
Whoops, thanks.

http://codereview.chromium.org/11154022/diff/5001/ash/system/web_notification...
File ash/system/web_notification/web_notification_tray.cc (right):

http://codereview.chromium.org/11154022/diff/5001/ash/system/web_notification...
ash/system/web_notification/web_notification_tray.cc:207: PopupBubble* bubble =
new PopupBubble(this);
Not a big deal, but the temp variable doesn't really help readability.

http://codereview.chromium.org/11154022/diff/5001/ash/system/web_notification...
File ash/system/web_notification/web_notification_view.cc (right):

http://codereview.chromium.org/11154022/diff/5001/ash/system/web_notification...
ash/system/web_notification/web_notification_view.cc:41: explicit
WebNotificationMenuModel(
This guy doesn't need to be explicit (not sure why it was before, probably my
mistake).

http://codereview.chromium.org/11154022/diff/5001/ash/system/web_notification...
ash/system/web_notification/web_notification_view.cc:163: const int
padding_width = kPaddingHorizontal/2;
whitespace around the /

[stevenjb, 2012-10-16 19:16:06]

http://codereview.chromium.org/11154022/diff/5001/ash/system/tray/system_tray.cc
File ash/system/tray/system_tray.cc (right):

http://codereview.chromium.org/11154022/diff/5001/ash/system/tray/system_tray...
ash/system/tray/system_tray.cc:68: bubble_.reset(bubble);
On 2012/10/16 01:05:42, miket wrote:
> Could this be an initializer?

Done.

http://codereview.chromium.org/11154022/diff/5001/ash/system/tray/system_tray...
ash/system/tray/system_tray.cc:116: notification_bubble_.reset();
On 2012/10/16 01:05:42, miket wrote:
> I don't see why these are necessary. Does the DestroyTrayView() below somehow
> depend on these guys giving up the resources before it runs? If so, a comment
to
> the effect that the ordering is necessary might help someone who's blindly
> optimizing away scoped_ptr resets in destructors.
The order here doesn't really matter, they just need to be destroyed before
~View() since the bubbles otherwise may have back pointers that will become
invalid. Added a comment.

http://codereview.chromium.org/11154022/diff/5001/ash/system/tray/tray_bubble...
File ash/system/tray/tray_bubble_view.h (right):

http://codereview.chromium.org/11154022/diff/5001/ash/system/tray/tray_bubble...
ash/system/tray/tray_bubble_view.h:10: // Specialized bubble view for bubbles
associated with a tray icon (e.g the
On 2012/10/16 01:05:42, miket wrote:
> e.g.

Done.

http://codereview.chromium.org/11154022/diff/5001/ash/system/tray/tray_bubble...
ash/system/tray/tray_bubble_view.h:62: // accesible name for the bubble.
On 2012/10/16 01:05:42, miket wrote:
> accessible

Done.

http://codereview.chromium.org/11154022/diff/5001/ash/system/web_notification...
File ash/system/web_notification/web_notification_tray.cc (right):

http://codereview.chromium.org/11154022/diff/5001/ash/system/web_notification...
ash/system/web_notification/web_notification_tray.cc:207: PopupBubble* bubble =
new PopupBubble(this);
On 2012/10/16 01:05:42, miket wrote:
> Not a big deal, but the temp variable doesn't really help readability.

Done.

http://codereview.chromium.org/11154022/diff/5001/ash/system/web_notification...
File ash/system/web_notification/web_notification_view.cc (right):

http://codereview.chromium.org/11154022/diff/5001/ash/system/web_notification...
ash/system/web_notification/web_notification_view.cc:41: explicit
WebNotificationMenuModel(
On 2012/10/16 01:05:42, miket wrote:
> This guy doesn't need to be explicit (not sure why it was before, probably my
> mistake).
Probably used to take one arg, and more likely my fault :)
Fixed.

http://codereview.chromium.org/11154022/diff/5001/ash/system/web_notification...
ash/system/web_notification/web_notification_view.cc:163: const int
padding_width = kPaddingHorizontal/2;
On 2012/10/16 01:05:42, miket wrote:
> whitespace around the /

Done.

[jennyz, 2012-10-16 23:09:38]

Looks like linux_chromeos and win_aura try bots failed for ash_unittests and
compiling, are they running the latest patch? If yes, please fix the issues.

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
File ash/system/web_notification/message_center_bubble.cc (right):

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
ash/system/web_notification/message_center_bubble.cc:87: class
FixedSizedScrollView : public views::ScrollView {
Is this the same class and code as the one in ash/system/tray/tray_views.cc? If
yes, are you planning to remove the duplicate code in tray_views.cc/h in the
future?

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
File ash/system/web_notification/web_notification_list.h (right):

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
ash/system/web_notification/web_notification_list.h:26: // Remove notifications
Remove->Removes

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
ash/system/web_notification/web_notification_list.h:30: // Disable notifications
Disable->Disables

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
File ash/system/web_notification/web_notification_tray.cc (right):

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
ash/system/web_notification/web_notification_tray.cc:323:
WebNotificationTray::GetNotificationList() {
Should line 323 indented for 4 blanks?

[stevenjb, 2012-10-17 00:52:50]

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
File ash/system/web_notification/message_center_bubble.cc (right):

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
ash/system/web_notification/message_center_bubble.cc:87: class
FixedSizedScrollView : public views::ScrollView {
On 2012/10/16 23:09:39, jennyz wrote:
> Is this the same class and code as the one in ash/system/tray/tray_views.cc?
If
> yes, are you planning to remove the duplicate code in tray_views.cc/h in the
> future?

It's *similar*, but I simplified it. I considered making this its own Views
class so that we can use it in both places, but the one in tray_views has a bit
of added complexity and it didn't seem worth creating a fully featured Views
class with tests, at least not now...

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
File ash/system/web_notification/web_notification_list.h (right):

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
ash/system/web_notification/web_notification_list.h:26: // Remove notifications
On 2012/10/16 23:09:39, jennyz wrote:
> Remove->Removes

Done.

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
ash/system/web_notification/web_notification_list.h:30: // Disable notifications
On 2012/10/16 23:09:39, jennyz wrote:
> Disable->Disables

Done.

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
File ash/system/web_notification/web_notification_tray.cc (right):

http://codereview.chromium.org/11154022/diff/11001/ash/system/web_notificatio...
ash/system/web_notification/web_notification_tray.cc:323:
WebNotificationTray::GetNotificationList() {
On 2012/10/16 23:09:39, jennyz wrote:
> Should line 323 indented for 4 blanks?
It's not defined in the style guide, but I've seen it this way elsewhere and
prefer it (otherwise it looks like a variable declaration).
That said, we're already 'using message_center::WebNotificationList', so I can
shorten this and make it more clear.
Done.

[jennyz, 2012-10-17 16:05:06]

lgtm

[commit-bot: I haz the power, 2012-10-18 21:40:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11154022/18031

[commit-bot: I haz the power, 2012-10-18 21:40:15]

Presubmit check for 11154022-18031 failed and returned exit status 1.


Running presubmit commit checks ...

** Presubmit ERRORS **
Missing LGTM from an OWNER for files in these directories:
    ash

Presubmit checks took 2.6s to calculate.

[commit-bot: I haz the power, 2012-10-18 21:50:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11154022/18031

[commit-bot: I haz the power, 2012-10-18 23:57:47]

Change committed as 162849