Skip to content

Commit

Permalink
chromeos: Clean up shelf party code, part 2
Browse files Browse the repository at this point in the history
Remove the feature pod / feature tile.

Bug: b:284500985
Test: ash_unittests
Change-Id: Ie21e0bb6ef5363b08e402b3d6ca470ce06ffeabd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4571664
Reviewed-by: Toni Barzic <tbarzic@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1150342}
  • Loading branch information
James Cook authored and Chromium LUCI CQ committed May 29, 2023
1 parent 8f12f9e commit db64e46
Show file tree
Hide file tree
Showing 17 changed files with 2 additions and 422 deletions.
3 changes: 0 additions & 3 deletions ash/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1066,8 +1066,6 @@ component("ash") {
"shelf/shelf_navigation_widget.cc",
"shelf/shelf_navigation_widget.h",
"shelf/shelf_observer.h",
"shelf/shelf_party_feature_pod_controller.cc",
"shelf/shelf_party_feature_pod_controller.h",
"shelf/shelf_shutdown_confirmation_bubble.cc",
"shelf/shelf_shutdown_confirmation_bubble.h",
"shelf/shelf_test_api.cc",
Expand Down Expand Up @@ -3185,7 +3183,6 @@ test("ash_unittests") {
"shelf/shelf_drag_handle_unittest.cc",
"shelf/shelf_layout_manager_unittest.cc",
"shelf/shelf_locking_manager_unittest.cc",
"shelf/shelf_party_feature_pod_controller_unittest.cc",
"shelf/shelf_tooltip_manager_unittest.cc",
"shelf/shelf_unittest.cc",
"shelf/shelf_view_unittest.cc",
Expand Down
18 changes: 0 additions & 18 deletions ash/ash_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -6421,24 +6421,6 @@ New install
</message>

<!-- Shelf Party -->
<message name="IDS_ASH_STATUS_TRAY_SHELF_PARTY_LABEL" desc="The text shown in the tray menu button that toggles Shelf Party mode.">
Shelf Party
</message>
<message name="IDS_ASH_STATUS_TRAY_SHELF_PARTY_TOGGLE_TOOLTIP" desc="The tooltip text used for the tray menu button that toggles Shelf Party mode.">
Toggle Shelf Party. <ph name="STATE_TEXT">$1<ex>Shelf Party is on.</ex></ph>
</message>
<message name="IDS_ASH_STATUS_TRAY_SHELF_PARTY_ENABLED_STATE_TOOLTIP" desc="The tooltip text indicating that Shelf Party mode is on.">
Shelf Party is on.
</message>
<message name="IDS_ASH_STATUS_TRAY_SHELF_PARTY_DISABLED_STATE_TOOLTIP" desc="The tooltip text indicating that Shelf Party mode is off.">
Shelf Party is off.
</message>
<message name="IDS_ASH_STATUS_TRAY_SHELF_PARTY_ON_SUBLABEL" desc="The sub label text shown under the tray menu button when Shelf Party mode is on.">
On
</message>
<message name="IDS_ASH_STATUS_TRAY_SHELF_PARTY_OFF_SUBLABEL" desc="The sub label text shown under the tray menu button when Shelf Party mode is off.">
Off
</message>
<message name="IDS_ASH_SHELF_ALL_PINNED_ITEMS_ARE_PARTYING" desc="The message that is displayed on the shelf when all pinned items are in Shelf Party (and therefore not shown on the shelf).">
All pinned items are partying
</message>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion ash/constants/quick_settings_catalogs.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ enum class QsFeatureCatalogName {
kIME = 12,
kLocale = 13,
kDarkMode = 14,
kShelfParty = 15,
kShelfParty_DEPRECATED = 15,
kAutozoom = 16,
kHotspot = 17,
kMaxValue = kHotspot
Expand Down
1 change: 0 additions & 1 deletion ash/resources/vector_icons/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@ aggregate_vector_icons("ash_vector_icons") {
"shelf_overflow.icon",
"shelf_overflow_horizontal_dots.icon",
"shelf_overview.icon",
"shelf_party.icon",
"shelf_position.icon",
"shelf_shutdown_button.icon",
"shelf_sign_out_button.icon",
Expand Down
43 changes: 0 additions & 43 deletions ash/resources/vector_icons/shelf_party.icon

This file was deleted.

153 changes: 0 additions & 153 deletions ash/shelf/shelf_party_feature_pod_controller.cc

This file was deleted.

60 changes: 0 additions & 60 deletions ash/shelf/shelf_party_feature_pod_controller.h

This file was deleted.

0 comments on commit db64e46

Please sign in to comment.