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

Issue 2166043003: mash: Migrate ShelfLockingManager to ash/common. (Closed)

Created:
4 years, 5 months ago by msw
Modified:
4 years, 5 months ago
Reviewers:
James Cook, piman
CC:
chromium-reviews, sadrul, dzhioev+watch_chromium.org, achuith+watch_chromium.org, oshima+watch_chromium.org, kalyank, 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 ShelfLockingManager to ash/common. tools/git/move_source_file.py ash/wm/lock_state_observer.h ash/common/wm/ tools/git/move_source_file.py ash/shelf/shelf_locking_manager* ash/common/shelf/ Move LockStateObservers and OnLockStateEvent helper to WmShell temporarily. (to avoid converting LockStateController to ash/common for now) Move ShelfLockingManager test access to Shelf/WmShelf. BUG=629254 TEST=Automated tests; no behavior changes. R=jamescook@chromium.org TBR=piman@chromium.org Committed: https://crrev.com/a0afa16d52f12081bbc2a780d2fef2943ff34cd7 Cr-Commit-Position: refs/heads/master@{#406671}

Patch Set 1 #

Patch Set 2 : Cleanup #

Patch Set 3 : Move ShelfLockingManager test access to Shelf. #

Total comments: 5
Unified diffs Side-by-side diffs Delta from patch set Stats (+93 lines, -312 lines) Patch
M ash/ash.gyp View 6 chunks +4 lines, -4 lines 0 comments Download
M ash/aura/wm_shelf_aura.h View 1 chunk +1 line, -0 lines 0 comments Download
M ash/aura/wm_shelf_aura.cc View 1 2 1 chunk +4 lines, -0 lines 0 comments Download
A + ash/common/shelf/shelf_locking_manager.h View 3 chunks +7 lines, -7 lines 0 comments Download
A + ash/common/shelf/shelf_locking_manager.cc View 3 chunks +6 lines, -9 lines 0 comments Download
A + ash/common/shelf/shelf_locking_manager_unittest.cc View 3 chunks +20 lines, -21 lines 2 comments Download
M ash/common/shelf/wm_shelf.h View 2 chunks +3 lines, -0 lines 0 comments Download
A + ash/common/wm/lock_state_observer.h View 2 chunks +3 lines, -3 lines 0 comments Download
M ash/common/wm_shell.h View 3 chunks +8 lines, -0 lines 3 comments Download
M ash/common/wm_shell.cc View 1 chunk +13 lines, -0 lines 0 comments Download
M ash/mus/bridge/wm_shelf_mus.h View 1 chunk +1 line, -0 lines 0 comments Download
M ash/mus/bridge/wm_shelf_mus.cc View 1 chunk +5 lines, -0 lines 0 comments Download
M ash/shelf/shelf.h View 1 2 2 chunks +5 lines, -1 line 0 comments Download
M ash/shelf/shelf.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/shelf/shelf_layout_manager.h View 1 chunk +1 line, -1 line 0 comments Download
M ash/shelf/shelf_layout_manager.cc View 3 chunks +2 lines, -3 lines 0 comments Download
M ash/shelf/shelf_layout_manager_unittest.cc View 1 1 chunk +0 lines, -1 line 0 comments Download
D ash/shelf/shelf_locking_manager.h View 1 chunk +0 lines, -52 lines 0 comments Download
D ash/shelf/shelf_locking_manager.cc View 1 chunk +0 lines, -59 lines 0 comments Download
D ash/shelf/shelf_locking_manager_unittest.cc View 1 chunk +0 lines, -83 lines 0 comments Download
M ash/test/shelf_test_api.h View 1 2 1 chunk +0 lines, -4 lines 0 comments Download
M ash/wm/lock_state_controller.h View 3 chunks +0 lines, -8 lines 0 comments Download
M ash/wm/lock_state_controller.cc View 4 chunks +6 lines, -21 lines 0 comments Download
D ash/wm/lock_state_observer.h View 1 chunk +0 lines, -28 lines 0 comments Download
M chrome/browser/chromeos/login/lock/webui_screen_locker.h View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/chromeos/login/lock/webui_screen_locker.cc View 1 3 chunks +2 lines, -5 lines 0 comments Download

Messages

Total messages: 25 (18 generated)
msw
Hey James, please take a look; thanks! +TBR piman@ for mechanical webui_screen_locker.* changes.
4 years, 5 months ago (2016-07-20 19:43:27 UTC) #7
James Cook
LGTM https://codereview.chromium.org/2166043003/diff/40001/ash/common/shelf/shelf_locking_manager_unittest.cc File ash/common/shelf/shelf_locking_manager_unittest.cc (right): https://codereview.chromium.org/2166043003/diff/40001/ash/common/shelf/shelf_locking_manager_unittest.cc#newcode82 ash/common/shelf/shelf_locking_manager_unittest.cc:82: } // namespace ash woo hoo, you were ...
4 years, 5 months ago (2016-07-20 21:14:30 UTC) #17
msw
https://codereview.chromium.org/2166043003/diff/40001/ash/common/shelf/shelf_locking_manager_unittest.cc File ash/common/shelf/shelf_locking_manager_unittest.cc (right): https://codereview.chromium.org/2166043003/diff/40001/ash/common/shelf/shelf_locking_manager_unittest.cc#newcode82 ash/common/shelf/shelf_locking_manager_unittest.cc:82: } // namespace ash On 2016/07/20 21:14:30, James Cook ...
4 years, 5 months ago (2016-07-20 21:21:14 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/2166043003/40001
4 years, 5 months ago (2016-07-20 21:21:57 UTC) #20
James Cook
still lgtm, land it! https://codereview.chromium.org/2166043003/diff/40001/ash/common/wm_shell.h File ash/common/wm_shell.h (right): https://codereview.chromium.org/2166043003/diff/40001/ash/common/wm_shell.h#newcode229 ash/common/wm_shell.h:229: // TODO: Move these back ...
4 years, 5 months ago (2016-07-20 21:23:25 UTC) #21
commit-bot: I haz the power
Committed patchset #3 (id:40001)
4 years, 5 months ago (2016-07-20 21:27:00 UTC) #23
commit-bot: I haz the power
4 years, 5 months ago (2016-07-20 21:30:09 UTC) #25
Message was sent while issue was closed.
Patchset 3 (id:??) landed as
https://crrev.com/a0afa16d52f12081bbc2a780d2fef2943ff34cd7
Cr-Commit-Position: refs/heads/master@{#406671}

Powered by Google App Engine
This is Rietveld 408576698