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

Issue 185143002: Revert of Ash:Shelf - Cleanup of Alternate Shelf (part 1) (Closed)

Created:
6 years, 9 months ago by dgrogan
Modified:
6 years, 9 months ago
CC:
chromium-reviews, kalyank, sadrul, ben+ash_chromium.org
Visibility:
Public.

Description

Revert of Ash:Shelf - Cleanup of Alternate Shelf (part 1) (https://codereview.chromium.org/140323010/) Reason for revert: Broke Linux ChromiumOS Builder (dbg): http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Builder%20%28dbg%29/builds/45933/steps/compile/logs/stdio FAILED: /b/build/goma/gomacc c++ -MMD -MF obj/ash/system/web_notification/ash.web_notification_tray.o.d .... ../../ash/system/web_notification/web_notification_tray.cc: In constructor 'ash::WebNotificationTray::WebNotificationTray(ash::internal::StatusAreaWidget*)': ../../ash/system/web_notification/web_notification_tray.cc:322:7:error: 'UseAlternateShelfLayout' is not a member of 'ash::switches' ../../ui/message_center/message_center_style.h: At global scope: ../../ui/message_center/message_center_style.h:103:15:error: 'message_center::kButtonSeparatorColor' defined but not used [-Werror=unused-variable] ../../ui/message_center/message_center_style.h:104:15:error: 'message_center::kHoveredButtonBackgroundColor' defined but not used [-Werror=unused-variable] ../../ui/message_center/message_center_style.h:111:15:error: 'message_center::kProgressBarBackgroundColor' defined but not used [-Werror=unused-variable] ../../ui/message_center/message_center_style.h:112:15:error: 'message_center::kProgressBarSliceColor' defined but not used [-Werror=unused-variable] ../../ui/message_center/message_center_style.h:43:15:error: 'message_center::settings::kEntrySeparatorColor' defined but not used [-Werror=unused-variable] Original issue's description: > Part 1) of cleaning up the code related to the shelf layout, specifically removing all instances of branching related to the 'alternate shelf layout' as this is now the only option. > Removed the about:flags entry relating to alternate shelf layout. > > A patch will follow to simplify the remaining layout code as it is still a bit of a spaghetti like mess. > > R=jamescook@chromium.org, skuhne@chromium.org > TBR=miket@chromium.org > BUG=338429 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=254301 TBR=jamescook@chromium.org,skuhne@chromium.org,harrym@chromium.org NOTREECHECKS=true NOTRY=true BUG=338429 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=254306

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1415 lines, -316 lines) Patch
M ash/ash.gyp View 1 chunk +2 lines, -0 lines 0 comments Download
M ash/ash_switches.h View 2 chunks +4 lines, -0 lines 0 comments Download
M ash/ash_switches.cc View 2 chunks +13 lines, -0 lines 0 comments Download
M ash/dip_unittest.cc View 1 chunk +39 lines, -0 lines 0 comments Download
M ash/display/display_controller_unittest.cc View 1 chunk +94 lines, -0 lines 0 comments Download
M ash/resources/ash_resources.grd View 1 chunk +5 lines, -2 lines 0 comments Download
A ash/resources/default_100_percent/common/launcher/launcher_underline_bottom_active.png View Binary file 0 comments Download
A ash/resources/default_100_percent/common/launcher/launcher_underline_bottom_hover.png View Binary file 0 comments Download
A ash/resources/default_100_percent/common/launcher/launcher_underline_bottom_running.png View Binary file 0 comments Download
A ash/resources/default_100_percent/common/launcher/launcher_underline_left_active.png View Binary file 0 comments Download
A ash/resources/default_100_percent/common/launcher/launcher_underline_left_hover.png View Binary file 0 comments Download
A ash/resources/default_100_percent/common/launcher/launcher_underline_left_running.png View Binary file 0 comments Download
A ash/resources/default_100_percent/common/launcher/launcher_underline_right_active.png View Binary file 0 comments Download
A ash/resources/default_100_percent/common/launcher/launcher_underline_right_hover.png View Binary file 0 comments Download
A ash/resources/default_100_percent/common/launcher/launcher_underline_right_running.png View Binary file 0 comments Download
A ash/resources/default_200_percent/common/launcher/launcher_underline_bottom_active.png View Binary file 0 comments Download
A ash/resources/default_200_percent/common/launcher/launcher_underline_bottom_hover.png View Binary file 0 comments Download
A ash/resources/default_200_percent/common/launcher/launcher_underline_bottom_running.png View Binary file 0 comments Download
A ash/resources/default_200_percent/common/launcher/launcher_underline_left_active.png View Binary file 0 comments Download
A ash/resources/default_200_percent/common/launcher/launcher_underline_left_hover.png View Binary file 0 comments Download
A ash/resources/default_200_percent/common/launcher/launcher_underline_left_running.png View Binary file 0 comments Download
A ash/resources/default_200_percent/common/launcher/launcher_underline_right_active.png View Binary file 0 comments Download
A ash/resources/default_200_percent/common/launcher/launcher_underline_right_hover.png View Binary file 0 comments Download
A ash/resources/default_200_percent/common/launcher/launcher_underline_right_running.png View Binary file 0 comments Download
M ash/shelf/app_list_button.h View 3 chunks +5 lines, -17 lines 0 comments Download
M ash/shelf/app_list_button.cc View 3 chunks +55 lines, -95 lines 0 comments Download
M ash/shelf/overflow_bubble_view.cc View 1 chunk +1 line, -1 line 0 comments Download
M ash/shelf/overflow_button.cc View 1 chunk +47 lines, -26 lines 0 comments Download
M ash/shelf/shelf_button.cc View 6 chunks +43 lines, -9 lines 0 comments Download
M ash/shelf/shelf_constants.h View 2 chunks +3 lines, -9 lines 0 comments Download
M ash/shelf/shelf_constants.cc View 1 chunk +1 line, -3 lines 0 comments Download
M ash/shelf/shelf_layout_manager.h View 1 chunk +8 lines, -0 lines 0 comments Download
M ash/shelf/shelf_layout_manager.cc View 6 chunks +46 lines, -15 lines 0 comments Download
M ash/shelf/shelf_model.cc View 2 chunks +40 lines, -19 lines 0 comments Download
M ash/shelf/shelf_model_unittest.cc View 2 chunks +113 lines, -0 lines 0 comments Download
M ash/shelf/shelf_navigator_unittest.cc View 5 chunks +65 lines, -0 lines 0 comments Download
M ash/shelf/shelf_view.h View 2 chunks +11 lines, -0 lines 0 comments Download
M ash/shelf/shelf_view.cc View 19 chunks +155 lines, -25 lines 0 comments Download
M ash/shelf/shelf_view_unittest.cc View 9 chunks +191 lines, -3 lines 0 comments Download
M ash/system/status_area_widget_delegate.cc View 2 chunks +13 lines, -0 lines 0 comments Download
M ash/system/tray/system_tray.cc View 3 chunks +9 lines, -5 lines 0 comments Download
M ash/system/tray/tray_background_view.cc View 10 chunks +142 lines, -42 lines 0 comments Download
M ash/system/tray/tray_constants.h View 1 chunk +4 lines, -4 lines 0 comments Download
M ash/system/tray/tray_constants.cc View 2 chunks +12 lines, -8 lines 0 comments Download
M ash/system/user/tray_user.cc View 4 chunks +25 lines, -12 lines 0 comments Download
M ash/system/web_notification/web_notification_tray.cc View 4 chunks +10 lines, -7 lines 0 comments Download
M ash/test/shelf_view_test_api.cc View 2 chunks +2 lines, -3 lines 0 comments Download
M ash/wm/app_list_controller.cc View 1 chunk +17 lines, -0 lines 0 comments Download
M chrome/browser/about_flags.cc View 1 chunk +8 lines, -0 lines 0 comments Download
M chrome/browser/ui/apps/chrome_app_window_delegate.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc View 4 chunks +13 lines, -6 lines 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc View 3 chunks +214 lines, -0 lines 0 comments Download
M chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc View 1 chunk +2 lines, -2 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
dgrogan
Created Revert of Ash:Shelf - Cleanup of Alternate Shelf (part 1)
6 years, 9 months ago (2014-03-01 01:02:10 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dgrogan@chromium.org/185143002/1
6 years, 9 months ago (2014-03-01 01:14:28 UTC) #2
commit-bot: I haz the power
6 years, 9 months ago (2014-03-01 01:17:24 UTC) #3
Message was sent while issue was closed.
Change committed as 254306

Powered by Google App Engine
This is Rietveld 408576698