Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Issue 2098023002: mash: Migrate remaining tray observers and notify functions. (Closed)

Created:
4 years, 6 months ago by msw
Modified:
4 years, 6 months ago
CC:
chromium-reviews, cbentzel+watch_chromium.org, sadrul, dtseng+watch_chromium.org, chromoting-reviews_chromium.org, aboxhall+watch_chromium.org, nektar+watch_chromium.org, yuzo+watch_chromium.org, je_julie, dmazzoni+watch_chromium.org, oshima+watch_chromium.org, kalyank, stevenjb+watch_chromium.org, davemoore+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

mash: Migrate remaining tray observers and notify functions. Move observers to common (but not their implementations): tools/git/move_source_file.py ash/system/chromeos/bluetooth/bluetooth_observer.h ash/common/system/chromeos/bluetooth/ tools/git/move_source_file.py ash/system/chromeos/enterprise/enterprise_domain_observer.h ash/common/system/chromeos/enterprise/ tools/git/move_source_file.py ash/system/chromeos/network/network_observer.h ash/common/system/chromeos/network/ tools/git/move_source_file.py ash/system/chromeos/network/network_portal_detector_observer.h ash/common/system/chromeos/network/ tools/git/move_source_file.py ash/system/chromeos/screen_security/screen_capture_observer.h ash/common/system/chromeos/screen_security/ tools/git/move_source_file.py ash/system/chromeos/screen_security/screen_share_observer.h ash/common/system/chromeos/screen_security/ tools/git/move_source_file.py ash/system/chromeos/session/last_window_closed_observer.h ash/common/system/chromeos/session/ tools/git/move_source_file.py ash/system/chromeos/session/logout_button_observer.h ash/common/system/chromeos/session/ tools/git/move_source_file.py ash/system/chromeos/session/session_length_limit_observer.h ash/common/system/chromeos/session/ tools/git/move_source_file.py ash/system/tray/media_security/media_capture_observer.h ash/common/system/chromeos/media_security/ tools/git/move_source_file.py ash/system/user/user_observer.h ash/common/system/user/ Move the ash/system/tray/media_security to ash/system/chromeos/: tools/git/move_source_file.py ash/system/tray/media_security/* ash/system/chromeos/media_security/ (this fits the pattern of other cros system tray features) Also remove the (now unnecessary) non-chromeos media_security build rules. Merge and reorder remaining SystemTrayNotifier functions. Rename WmSystemTrayNotifier to SystemTrayNotifier: tools/git/move_source_file.py ash/common/system/tray/wm_system_tray_notifier.h ash/common/system/tray/system_tray_notifier.h tools/git/move_source_file.py ash/common/system/tray/wm_system_tray_notifier.cc ash/common/system/tray/system_tray_notifier.cc Use WmShell::Get()->GetSessionStateDelegate() more; minor cleanup and IWYU. Use AshTestBase::GetPrimarySystemTray in screen_tray_item_unittest.cc BUG=619636 TEST=Compiles; automated tests; no behavior changes. R=jamescook@chromium.org TBR=sky@chromium.org,yusukes@chromium.org,wez@chromium.org Committed: https://crrev.com/5c804fb217d79733cbab0be093bdbe69ed9098d2 Cr-Commit-Position: refs/heads/master@{#402022}

Patch Set 1 #

Patch Set 2 : Fix include ordering. #

Patch Set 3 : Rename WmSystemTrayNotifier to SystemTrayNotifier. #

Patch Set 4 : Move non-common media_security files to chromeos. #

Patch Set 5 : Sync and rebase. #

Total comments: 1
Unified diffs Side-by-side diffs Delta from patch set Stats (+728 lines, -1411 lines) Patch
M ash/BUILD.gn View 1 2 3 2 chunks +0 lines, -4 lines 0 comments Download
M ash/accelerators/accelerator_controller.cc View 1 2 3 4 3 chunks +2 lines, -2 lines 0 comments Download
M ash/accelerators/accelerator_interactive_uitest_chromeos.cc View 1 2 5 chunks +11 lines, -12 lines 0 comments Download
M ash/ash.gyp View 1 2 3 4 11 chunks +15 lines, -21 lines 0 comments Download
M ash/ash_touch_exploration_manager_chromeos.cc View 1 2 2 chunks +2 lines, -2 lines 0 comments Download
M ash/common/keyboard/keyboard_ui.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M ash/common/system/audio/tray_audio.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
A + ash/common/system/chromeos/bluetooth/bluetooth_observer.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + ash/common/system/chromeos/enterprise/enterprise_domain_observer.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + ash/common/system/chromeos/media_security/media_capture_observer.h View 2 chunks +4 lines, -6 lines 0 comments Download
A + ash/common/system/chromeos/network/network_observer.h View 2 chunks +3 lines, -7 lines 0 comments Download
A + ash/common/system/chromeos/network/network_portal_detector_observer.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + ash/common/system/chromeos/screen_security/screen_capture_observer.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + ash/common/system/chromeos/screen_security/screen_share_observer.h View 3 chunks +5 lines, -6 lines 0 comments Download
A + ash/common/system/chromeos/session/last_window_closed_observer.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + ash/common/system/chromeos/session/logout_button_observer.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + ash/common/system/chromeos/session/session_length_limit_observer.h View 2 chunks +3 lines, -3 lines 0 comments Download
M ash/common/system/chromeos/system_clock_observer.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M ash/common/system/chromeos/tray_tracing.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M ash/common/system/date/tray_date.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M ash/common/system/ime/tray_ime_chromeos.cc View 1 2 2 chunks +3 lines, -3 lines 0 comments Download
M ash/common/system/ime/tray_ime_chromeos_unittest.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M ash/common/system/locale/locale_notification_controller.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
A + ash/common/system/tray/system_tray_notifier.h View 1 2 3 4 2 chunks +132 lines, -54 lines 0 comments Download
A ash/common/system/tray/system_tray_notifier.cc View 1 2 1 chunk +383 lines, -0 lines 0 comments Download
M ash/common/system/tray/wm_system_tray_notifier.h View 1 2 1 chunk +0 lines, -110 lines 0 comments Download
M ash/common/system/tray/wm_system_tray_notifier.cc View 1 2 1 chunk +0 lines, -182 lines 0 comments Download
M ash/common/system/tray_accessibility.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M ash/common/system/update/tray_update.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M ash/common/system/update/tray_update_unittest.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M ash/common/wm_shell.h View 1 2 3 chunks +3 lines, -3 lines 0 comments Download
M ash/common/wm_shell.cc View 1 2 2 chunks +2 lines, -2 lines 0 comments Download
M ash/root_window_controller.cc View 1 2 3 4 1 chunk +0 lines, -1 line 0 comments Download
M ash/shell.h View 1 2 3 4 3 chunks +0 lines, -6 lines 1 comment Download
M ash/shell.cc View 1 2 3 4 3 chunks +0 lines, -8 lines 0 comments Download
M ash/system/cast/tray_cast.cc View 1 chunk +0 lines, -1 line 0 comments Download
D ash/system/chromeos/bluetooth/bluetooth_observer.h View 1 chunk +0 lines, -20 lines 0 comments Download
M ash/system/chromeos/bluetooth/tray_bluetooth.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/bluetooth/tray_bluetooth.cc View 1 2 3 chunks +3 lines, -4 lines 0 comments Download
M ash/system/chromeos/brightness/tray_brightness.cc View 1 chunk +0 lines, -1 line 0 comments Download
D ash/system/chromeos/enterprise/enterprise_domain_observer.h View 1 chunk +0 lines, -20 lines 0 comments Download
M ash/system/chromeos/enterprise/tray_enterprise.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/enterprise/tray_enterprise.cc View 1 2 3 4 2 chunks +3 lines, -6 lines 0 comments Download
A + ash/system/chromeos/media_security/multi_profile_media_tray_item.h View 1 2 3 2 chunks +3 lines, -3 lines 0 comments Download
A + ash/system/chromeos/media_security/multi_profile_media_tray_item.cc View 1 2 3 2 chunks +7 lines, -7 lines 0 comments Download
A + ash/system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
D ash/system/chromeos/network/network_observer.h View 1 chunk +0 lines, -26 lines 0 comments Download
D ash/system/chromeos/network/network_portal_detector_observer.h View 1 chunk +0 lines, -22 lines 0 comments Download
M ash/system/chromeos/network/tray_network.h View 1 chunk +2 lines, -2 lines 0 comments Download
M ash/system/chromeos/network/tray_network.cc View 1 2 2 chunks +3 lines, -4 lines 0 comments Download
M ash/system/chromeos/network/tray_sms.cc View 1 chunk +0 lines, -1 line 0 comments Download
M ash/system/chromeos/power/power_event_observer.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
D ash/system/chromeos/screen_security/screen_capture_observer.h View 1 chunk +0 lines, -29 lines 0 comments Download
M ash/system/chromeos/screen_security/screen_capture_tray_item.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/screen_security/screen_capture_tray_item.cc View 1 2 2 chunks +3 lines, -5 lines 0 comments Download
D ash/system/chromeos/screen_security/screen_share_observer.h View 1 chunk +0 lines, -29 lines 0 comments Download
M ash/system/chromeos/screen_security/screen_share_tray_item.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/screen_security/screen_share_tray_item.cc View 1 2 2 chunks +4 lines, -5 lines 0 comments Download
M ash/system/chromeos/screen_security/screen_tray_item.h View 1 chunk +0 lines, -1 line 0 comments Download
M ash/system/chromeos/screen_security/screen_tray_item_unittest.cc View 1 2 8 chunks +16 lines, -23 lines 0 comments Download
M ash/system/chromeos/session/last_window_closed_logout_reminder.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/session/last_window_closed_logout_reminder.cc View 1 2 3 4 2 chunks +3 lines, -5 lines 0 comments Download
D ash/system/chromeos/session/last_window_closed_observer.h View 1 chunk +0 lines, -20 lines 0 comments Download
D ash/system/chromeos/session/logout_button_observer.h View 1 chunk +0 lines, -30 lines 0 comments Download
M ash/system/chromeos/session/logout_button_tray.h View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/session/logout_button_tray.cc View 1 2 3 4 3 chunks +3 lines, -4 lines 0 comments Download
D ash/system/chromeos/session/session_length_limit_observer.h View 1 chunk +0 lines, -26 lines 0 comments Download
M ash/system/chromeos/session/tray_session_length_limit.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/system/chromeos/session/tray_session_length_limit.cc View 1 2 2 chunks +4 lines, -6 lines 0 comments Download
M ash/system/chromeos/supervised/tray_supervised_user.cc View 1 2 3 4 1 chunk +0 lines, -1 line 0 comments Download
M ash/system/chromeos/tray_caps_lock.cc View 1 chunk +0 lines, -1 line 0 comments Download
M ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc View 1 chunk +0 lines, -1 line 0 comments Download
D ash/system/tray/media_security/media_capture_observer.h View 1 chunk +0 lines, -23 lines 0 comments Download
D ash/system/tray/media_security/multi_profile_media_tray_item.h View 1 2 3 1 chunk +0 lines, -36 lines 0 comments Download
M ash/system/tray/media_security/multi_profile_media_tray_item.cc View 1 2 3 1 chunk +0 lines, -81 lines 0 comments Download
D ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc View 1 2 3 1 chunk +0 lines, -58 lines 0 comments Download
M ash/system/tray/system_tray.cc View 1 2 3 4 2 chunks +1 line, -1 line 0 comments Download
D ash/system/tray/system_tray_notifier.h View 1 2 3 4 1 chunk +0 lines, -124 lines 0 comments Download
D ash/system/tray/system_tray_notifier.cc View 1 chunk +0 lines, -227 lines 0 comments Download
M ash/system/user/tray_user.cc View 1 2 3 4 6 chunks +6 lines, -7 lines 0 comments Download
M ash/system/user/user_card_view.cc View 1 2 3 4 6 chunks +8 lines, -11 lines 0 comments Download
M ash/test/test_shell_delegate.cc View 1 2 3 chunks +4 lines, -4 lines 0 comments Download
M ash/virtual_keyboard_controller.h View 1 chunk +0 lines, -1 line 0 comments Download
M ash/virtual_keyboard_controller.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M ash/virtual_keyboard_controller_unittest.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/chromeos/accessibility/accessibility_manager.cc View 1 2 3 4 1 chunk +0 lines, -1 line 0 comments Download
M chrome/browser/chromeos/accessibility/magnification_manager.cc View 1 chunk +0 lines, -1 line 0 comments Download
M chrome/browser/chromeos/locale_change_guard.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/chromeos/net/network_portal_notification_controller.cc View 1 2 2 chunks +5 lines, -6 lines 0 comments Download
M chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.cc View 1 2 2 chunks +4 lines, -4 lines 0 comments Download
M chrome/browser/ui/ash/media_delegate_chromeos.cc View 1 2 2 chunks +3 lines, -5 lines 0 comments Download
M chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc View 1 2 6 chunks +12 lines, -13 lines 0 comments Download
M chrome/browser/ui/ash/system_tray_delegate_chromeos.h View 1 2 3 chunks +1 line, -4 lines 0 comments Download
M chrome/browser/ui/ash/system_tray_delegate_chromeos.cc View 1 2 3 4 10 chunks +15 lines, -22 lines 0 comments Download
M components/arc/audio/arc_audio_bridge.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M remoting/host/disconnect_window_chromeos.cc View 1 2 3 chunks +6 lines, -6 lines 0 comments Download

Messages

Total messages: 24 (13 generated)
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2098023002/40001
4 years, 6 months ago (2016-06-24 22:27:10 UTC) #2
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: chromeos_amd64-generic_chromium_compile_only_ng on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_amd64-generic_chromium_compile_only_ng/builds/158509) chromium_presubmit on ...
4 years, 6 months ago (2016-06-24 22:31:04 UTC) #4
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2098023002/100001
4 years, 6 months ago (2016-06-24 23:08:38 UTC) #7
msw
Hey James, please take a look; thanks!
4 years, 6 months ago (2016-06-24 23:18:05 UTC) #10
James Cook
LGTM. Nice patch. It looks like it makes it possible for some things to just ...
4 years, 6 months ago (2016-06-24 23:37:04 UTC) #11
msw
+TBR sky: chrome/*, yusukes: components/arc/*, wez: remoting/*
4 years, 6 months ago (2016-06-24 23:51:23 UTC) #14
Wez
-wez, +sergeyu
4 years, 6 months ago (2016-06-24 23:55:33 UTC) #16
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
4 years, 6 months ago (2016-06-25 00:02:28 UTC) #18
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2098023002/100001
4 years, 6 months ago (2016-06-25 00:03:16 UTC) #20
commit-bot: I haz the power
Committed patchset #5 (id:100001)
4 years, 6 months ago (2016-06-25 00:10:09 UTC) #22
commit-bot: I haz the power
4 years, 6 months ago (2016-06-25 00:13:27 UTC) #24
Message was sent while issue was closed.
Patchset 5 (id:??) landed as
https://crrev.com/5c804fb217d79733cbab0be093bdbe69ed9098d2
Cr-Commit-Position: refs/heads/master@{#402022}

Powered by Google App Engine
This is Rietveld 408576698