|
Reland: mash: Convert TrayBackgroundView to wm common types
The previous version of this patch, https://codereview.chromium.org/2091933002
collided during commit with https://codereview.chromium.org/2087703002. This
is just a rebase.
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=msw@chromium.org
Committed: https://crrev.com/380fac77139a702a0108cded2c5444e1bdce0375
Cr-Commit-Position: refs/heads/master@{#401820}
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+114 lines, -1498 lines) |
Patch |
|
M |
ash/ash.gyp
|
View
|
|
2 chunks |
+8 lines, -8 lines |
0 comments
|
Download
|
|
A + |
ash/common/system/tray/system_tray_bubble.h
|
View
|
|
2 chunks |
+4 lines, -4 lines |
0 comments
|
Download
|
|
A + |
ash/common/system/tray/system_tray_bubble.cc
|
View
|
|
1 chunk |
+2 lines, -3 lines |
0 comments
|
Download
|
|
A + |
ash/common/system/tray/tray_background_view.h
|
View
|
|
6 chunks |
+7 lines, -15 lines |
0 comments
|
Download
|
|
A + |
ash/common/system/tray/tray_background_view.cc
|
View
|
|
8 chunks |
+24 lines, -33 lines |
0 comments
|
Download
|
|
A + |
ash/common/system/tray/tray_bubble_wrapper.h
|
View
|
|
2 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
|
A + |
ash/common/system/tray/tray_bubble_wrapper.cc
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
|
A + |
ash/common/system/tray/tray_event_filter.h
|
View
|
|
2 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
|
A + |
ash/common/system/tray/tray_event_filter.cc
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
ash/shelf/overflow_bubble.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
ash/system/chromeos/network/tray_sms.cc
|
View
|
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
ash/system/chromeos/session/logout_button_tray.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
ash/system/chromeos/session/logout_button_tray.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
|
View
|
1
|
1 chunk |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
ash/system/overview/overview_button_tray.h
|
View
|
|
2 chunks |
+3 lines, -1 line |
0 comments
|
Download
|
|
M |
ash/system/overview/overview_button_tray.cc
|
View
|
1
|
2 chunks |
+2 lines, -1 line |
0 comments
|
Download
|
|
M |
ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc
|
View
|
|
2 chunks |
+7 lines, -7 lines |
0 comments
|
Download
|
|
M |
ash/system/tray/system_tray.h
|
View
|
|
3 chunks |
+6 lines, -3 lines |
0 comments
|
Download
|
|
M |
ash/system/tray/system_tray.cc
|
View
|
1
|
7 chunks |
+7 lines, -5 lines |
0 comments
|
Download
|
|
D |
ash/system/tray/system_tray_bubble.h
|
View
|
|
1 chunk |
+0 lines, -78 lines |
0 comments
|
Download
|
|
D |
ash/system/tray/system_tray_bubble.cc
|
View
|
|
1 chunk |
+0 lines, -326 lines |
0 comments
|
Download
|
|
M |
ash/system/tray/system_tray_unittest.cc
|
View
|
|
2 chunks |
+3 lines, -2 lines |
0 comments
|
Download
|
|
D |
ash/system/tray/tray_background_view.h
|
View
|
|
1 chunk |
+0 lines, -186 lines |
0 comments
|
Download
|
|
D |
ash/system/tray/tray_background_view.cc
|
View
|
|
1 chunk |
+0 lines, -530 lines |
0 comments
|
Download
|
|
D |
ash/system/tray/tray_bubble_wrapper.h
|
View
|
|
1 chunk |
+0 lines, -47 lines |
0 comments
|
Download
|
|
D |
ash/system/tray/tray_bubble_wrapper.cc
|
View
|
|
1 chunk |
+0 lines, -58 lines |
0 comments
|
Download
|
|
D |
ash/system/tray/tray_event_filter.h
|
View
|
|
1 chunk |
+0 lines, -53 lines |
0 comments
|
Download
|
|
D |
ash/system/tray/tray_event_filter.cc
|
View
|
|
1 chunk |
+0 lines, -101 lines |
0 comments
|
Download
|
|
M |
ash/system/web_notification/web_notification_tray.h
|
View
|
|
2 chunks |
+2 lines, -1 line |
0 comments
|
Download
|
|
M |
ash/system/web_notification/web_notification_tray.cc
|
View
|
1
2
|
9 chunks |
+20 lines, -16 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/ui/focus_ring_controller.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
Total messages: 13 (8 generated)
|