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

Issue 2357143004: mash: Support ShelfWindowWatcher via ShelfItem properties. (Closed)

Created:
4 years, 3 months ago by msw
Modified:
4 years, 2 months ago
Reviewers:
Tom Sepez, James Cook
CC:
chromium-reviews, sadrul, qsr+mojo_chromium.org, viettrungluu+watch_chromium.org, yzshen+watch_chromium.org, abarth-chromium, Aaron Boodman, kalyank, darin (slow to review)
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

mash: Support ShelfWindowWatcher via ShelfItem properties. Show mash shelf items for open windows via ShelfWindowWatcher. Decompose ash::ShelfItemDetails into several window properties. Use the existing window title, with new WmWindow setters. Add window icon and shelf item type properties. Support "Settings" tooltip instead of "Google Chrome - Settings". Use WmWindow directly in ShelfWindowWatcherItemDelegate. (don't go through wm::WindowState helpers) TODO: combine mash browser window items. TODO: fix crash when clicking new shelf items, surfaced here. TODO: fix mash settings window title and icon. TODO: aura::Window::SetTitle calls observers always BUG=634150 TEST=No cros regresssions; mash shelf shows items for open windows. R=jamescook@chromium.org,tsepez@chromium.org Committed: https://crrev.com/6ab444005ded90d3b70ad8bd086888307dcc924a Cr-Commit-Position: refs/heads/master@{#421788}

Patch Set 1 #

Patch Set 2 : Implement ShelfItemDetails property type converter; try setting WmWindow title. #

Patch Set 3 : Remove ShelfItemDetails title; only used for settings. #

Patch Set 4 : Store ShelfItemDetails as a shared property, not a pointer. #

Patch Set 5 : Cleanup; change GetShelfItemDetails to not return a pointer. #

Patch Set 6 : Reimplement TypeConverter like other property type converters. #

Patch Set 7 : Remove ShelfItemDetails; store type and icon int properties. #

Patch Set 8 : Set Settings WmWindow title with a WmWindowObserver. #

Total comments: 26

Patch Set 9 : Address comments. #

Total comments: 6

Patch Set 10 : Address comments. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+183 lines, -171 lines) Patch
M ash/aura/wm_window_aura.h View 1 2 3 4 5 6 7 8 9 2 chunks +1 line, -3 lines 0 comments Download
M ash/aura/wm_window_aura.cc View 1 2 3 4 5 6 7 8 9 6 chunks +26 lines, -20 lines 0 comments Download
M ash/common/shelf/shelf_constants.h View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M ash/common/shelf/shelf_item_types.h View 1 2 3 4 5 6 2 chunks +0 lines, -16 lines 0 comments Download
M ash/common/shelf/shelf_item_types.cc View 1 2 3 4 5 6 1 chunk +0 lines, -3 lines 0 comments Download
M ash/common/shelf/shelf_window_watcher.h View 1 2 3 4 5 6 4 chunks +5 lines, -5 lines 0 comments Download
M ash/common/shelf/shelf_window_watcher.cc View 1 2 3 4 5 6 7 8 9 5 chunks +24 lines, -22 lines 0 comments Download
M ash/common/shelf/shelf_window_watcher_item_delegate.cc View 1 2 3 4 2 chunks +6 lines, -11 lines 0 comments Download
M ash/common/shelf/shelf_window_watcher_unittest.cc View 1 2 3 4 5 6 7 8 9 6 chunks +15 lines, -15 lines 0 comments Download
M ash/common/wm_window.h View 1 2 3 4 5 6 7 8 9 3 chunks +1 line, -6 lines 0 comments Download
M ash/common/wm_window_property.h View 1 2 3 4 5 6 7 8 9 1 chunk +5 lines, -2 lines 0 comments Download
M ash/mus/bridge/wm_window_mus.h View 1 2 3 4 5 6 7 8 9 2 chunks +1 line, -3 lines 0 comments Download
M ash/mus/bridge/wm_window_mus.cc View 1 2 3 4 5 6 7 8 9 7 chunks +51 lines, -24 lines 0 comments Download
M ash/mus/property_util.h View 1 3 4 5 6 7 1 chunk +1 line, -0 lines 0 comments Download
M ash/mus/property_util.cc View 1 3 4 5 6 7 1 chunk +5 lines, -0 lines 0 comments Download
M chrome/browser/ui/ash/launcher/browser_status_monitor.cc View 1 2 3 4 5 6 7 8 9 3 chunks +18 lines, -8 lines 0 comments Download
M chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc View 1 2 3 4 5 6 7 5 chunks +14 lines, -27 lines 0 comments Download
M chrome/browser/ui/views/task_manager_view.cc View 1 2 3 4 5 6 7 8 9 1 chunk +4 lines, -5 lines 0 comments Download
M services/ui/public/interfaces/window_manager.mojom View 1 2 3 4 5 6 7 8 1 chunk +5 lines, -0 lines 0 comments Download

Messages

Total messages: 35 (24 generated)
msw
Hey James, please take a look; thanks!
4 years, 2 months ago (2016-09-28 17:39:03 UTC) #7
James Cook
https://codereview.chromium.org/2357143004/diff/190001/ash/aura/wm_window_aura.cc File ash/aura/wm_window_aura.cc (right): https://codereview.chromium.org/2357143004/diff/190001/ash/aura/wm_window_aura.cc#newcode54 ash/aura/wm_window_aura.cc:54: DEFINE_WINDOW_PROPERTY_KEY(int, kShelfIconIdKey, kInvalidImageResourceID); So on aura, GetWindowProperty(kShelfIconIdKey) for a ...
4 years, 2 months ago (2016-09-28 20:41:03 UTC) #12
msw
Hey James, please take another look; thanks! Hey Tom, please take a look at window_manager.mojom, ...
4 years, 2 months ago (2016-09-28 23:27:46 UTC) #15
Tom Sepez
mojom LGTM
4 years, 2 months ago (2016-09-28 23:45:19 UTC) #18
James Cook
LGTM with nits, but please look into the icon ID for the multi-profile task manager ...
4 years, 2 months ago (2016-09-29 02:49:46 UTC) #21
msw
Comments addressed; landing. I'll follow up with TODOs next. https://codereview.chromium.org/2357143004/diff/210001/ash/common/wm_window_property.h File ash/common/wm_window_property.h (right): https://codereview.chromium.org/2357143004/diff/210001/ash/common/wm_window_property.h#newcode21 ash/common/wm_window_property.h:21: ...
4 years, 2 months ago (2016-09-29 06:23:36 UTC) #24
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/2357143004/230001
4 years, 2 months ago (2016-09-29 06:23:56 UTC) #27
commit-bot: I haz the power
Try jobs failed on following builders: android_n5x_swarming_rel on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_n5x_swarming_rel/builds/38913)
4 years, 2 months ago (2016-09-29 08:10:30 UTC) #29
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/2357143004/230001
4 years, 2 months ago (2016-09-29 09:00:13 UTC) #31
commit-bot: I haz the power
Committed patchset #10 (id:230001)
4 years, 2 months ago (2016-09-29 09:40:30 UTC) #33
commit-bot: I haz the power
4 years, 2 months ago (2016-09-29 09:42:28 UTC) #35
Message was sent while issue was closed.
Patchset 10 (id:??) landed as
https://crrev.com/6ab444005ded90d3b70ad8bd086888307dcc924a
Cr-Commit-Position: refs/heads/master@{#421788}

Powered by Google App Engine
This is Rietveld 408576698