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

Issue 2093283002: mash: Convert all of //ash/system to use WmShelf (Closed)

Created:
4 years, 6 months ago by James Cook
Modified:
4 years, 5 months ago
Reviewers:
msw
CC:
chromium-reviews, kalyank, stevenjb+watch_chromium.org, sadrul, oshima+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: Convert all of //ash/system to use WmShelf This breaks dependencies on //ash/shelf in favor of one on //ash/common. * Add WmShelf::ForPrimaryDisplay(). * Remove AshTestBase::GetPrimaryShelf() in favor of above. * Skip unnecessary setting of shelf visibility state and auto-hide state in tests. * Remove unnecessary includes. BUG=615502, 619636 TEST=ash_unittests Committed: https://crrev.com/54a4d47fa4f8602431aa7b646fd7a77d34e96818 Cr-Commit-Position: refs/heads/master@{#402257}

Patch Set 1 #

Total comments: 17

Patch Set 2 : rebase #

Patch Set 3 : review comments #

Patch Set 4 : rebase again #

Patch Set 5 : rebase #

Unified diffs Side-by-side diffs Delta from patch set Stats (+124 lines, -116 lines) Patch
M ash/ash.gyp View 1 1 chunk +1 line, -0 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
M ash/common/shelf/wm_shelf.h View 2 chunks +8 lines, -0 lines 0 comments Download
A ash/common/shelf/wm_shelf.cc View 1 chunk +21 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 +4 lines, -0 lines 0 comments Download
M ash/shelf/shelf_layout_manager.h View 1 2 3 4 2 chunks +3 lines, -3 lines 0 comments Download
M ash/shelf/shelf_layout_manager.cc View 1 2 3 4 2 chunks +20 lines, -20 lines 0 comments Download
M ash/system/DEPS View 1 chunk +3 lines, -2 lines 0 comments Download
M ash/system/cast/tray_cast.cc View 1 2 3 4 1 chunk +0 lines, -1 line 0 comments Download
M ash/system/chromeos/network/tray_network.cc View 1 1 chunk +0 lines, -1 line 0 comments Download
M ash/system/chromeos/screen_security/screen_tray_item.cc View 1 2 3 4 1 chunk +0 lines, -1 line 0 comments Download
M ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc View 1 2 3 4 1 chunk +0 lines, -2 lines 0 comments Download
M ash/system/overview/overview_button_tray.cc View 1 2 3 4 1 chunk +0 lines, -1 line 0 comments Download
M ash/system/toast/toast_manager_unittest.cc View 1 2 10 chunks +26 lines, -44 lines 0 comments Download
M ash/system/toast/toast_overlay.cc View 1 2 5 chunks +16 lines, -10 lines 0 comments Download
M ash/system/tray/system_tray_unittest.cc View 1 2 3 4 3 chunks +3 lines, -3 lines 0 comments Download
M ash/system/user/tray_user.cc View 1 2 3 4 1 chunk +0 lines, -2 lines 0 comments Download
M ash/system/user/tray_user_unittest.cc View 2 chunks +0 lines, -6 lines 0 comments Download
M ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc View 1 2 3 4 5 chunks +7 lines, -14 lines 0 comments Download
M ash/system/web_notification/web_notification_tray_unittest.cc View 1 2 3 4 6 chunks +6 lines, -6 lines 0 comments Download

Messages

Total messages: 11 (4 generated)
James Cook
msw, please take a look. https://codereview.chromium.org/2093283002/diff/1/ash/shelf/shelf_layout_manager.h File ash/shelf/shelf_layout_manager.h (right): https://codereview.chromium.org/2093283002/diff/1/ash/shelf/shelf_layout_manager.h#newcode213 ash/shelf/shelf_layout_manager.h:213: friend class WmShelfAura; For ...
4 years, 6 months ago (2016-06-24 23:20:09 UTC) #2
msw
Sorry, I have some questions/thoughts. https://codereview.chromium.org/2093283002/diff/1/ash/aura/wm_shelf_aura.cc File ash/aura/wm_shelf_aura.cc (right): https://codereview.chromium.org/2093283002/diff/1/ash/aura/wm_shelf_aura.cc#newcode171 ash/aura/wm_shelf_aura.cc:171: void WmShelfAura::SetKeyboardBoundsForTesting(const gfx::Rect& bounds) ...
4 years, 6 months ago (2016-06-25 00:18:30 UTC) #3
James Cook
msw, please take another look. https://codereview.chromium.org/2093283002/diff/1/ash/aura/wm_shelf_aura.cc File ash/aura/wm_shelf_aura.cc (right): https://codereview.chromium.org/2093283002/diff/1/ash/aura/wm_shelf_aura.cc#newcode171 ash/aura/wm_shelf_aura.cc:171: void WmShelfAura::SetKeyboardBoundsForTesting(const gfx::Rect& bounds) ...
4 years, 6 months ago (2016-06-25 01:20:58 UTC) #4
msw
lgtm https://codereview.chromium.org/2093283002/diff/1/ash/system/web_notification/web_notification_tray_unittest.cc File ash/system/web_notification/web_notification_tray_unittest.cc (right): https://codereview.chromium.org/2093283002/diff/1/ash/system/web_notification/web_notification_tray_unittest.cc#newcode456 ash/system/web_notification/web_notification_tray_unittest.cc:456: shelf->UpdateVisibilityState(); On 2016/06/25 01:20:58, James Cook wrote: > ...
4 years, 5 months ago (2016-06-27 18:11:36 UTC) #5
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/2093283002/80001
4 years, 5 months ago (2016-06-27 18:23:39 UTC) #8
commit-bot: I haz the power
Committed patchset #5 (id:80001)
4 years, 5 months ago (2016-06-27 19:37:46 UTC) #9
commit-bot: I haz the power
4 years, 5 months ago (2016-06-27 19:40:49 UTC) #11
Message was sent while issue was closed.
Patchset 5 (id:??) landed as
https://crrev.com/54a4d47fa4f8602431aa7b646fd7a77d34e96818
Cr-Commit-Position: refs/heads/master@{#402257}

Powered by Google App Engine
This is Rietveld 408576698