Issue 229453005: Shelf Cleanup AlternateShelfLayout P1 Attempt 3

Issue 229453005: Shelf Cleanup AlternateShelfLayout P1 Attempt 3 (Closed)

Created:
6 years, 8 months ago by Harry McCleave

Modified:
6 years, 8 months ago

Reviewers:

CC:
chromium-reviews, kalyank, stevenjb+watch_chromium.org, sadrul, oshima+watch_chromium.org, ben+ash_chromium.org

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

More Reviews

Description

Shelf Cleanup AlternateShelfLayout P1 Attempt 3 R=skuhne@chromium.org TBR=jamescook@chromium.org, miket@chromium.org, skuhne@chromium.org BUG=338429 re-landing of https://codereview.chromium.org/176883022/ with fix for the inset of app panel as discussed offline /w jennyz@ Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=263451

Patch Set 1 #

Patch Set 2 : rebase #

Created: 6 years, 8 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+326 lines, -1501 lines)			Patch
M	ash/ash.gyp	View	1	1 chunk	+0 lines, -2 lines	0 comments	Download
M	ash/ash_switches.h	View		3 chunks	+0 lines, -5 lines	0 comments	Download
M	ash/ash_switches.cc	View		3 chunks	+0 lines, -17 lines	0 comments	Download
M	ash/dip_unittest.cc	View		1 chunk	+0 lines, -39 lines	0 comments	Download
M	ash/display/display_controller_unittest.cc	View		1 chunk	+0 lines, -93 lines	0 comments	Download
M	ash/resources/ash_resources.grd	View	1	1 chunk	+3 lines, -7 lines	0 comments	Download
D	ash/shelf/alternate_app_list_button.h	View		1 chunk	+0 lines, -54 lines	0 comments	Download
M	ash/shelf/app_list_button.h	View		3 chunks	+16 lines, -6 lines	0 comments	Download
M	ash/shelf/app_list_button.cc	View	1	4 chunks	+95 lines, -51 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	1 chunk	+27 lines, -48 lines	0 comments	Download
M	ash/shelf/shelf_button.cc	View	1	6 chunks	+9 lines, -53 lines	0 comments	Download
M	ash/shelf/shelf_constants.h	View		2 chunks	+9 lines, -3 lines	0 comments	Download
M	ash/shelf/shelf_constants.cc	View		1 chunk	+3 lines, -1 line	0 comments	Download
M	ash/shelf/shelf_layout_manager.h	View		1 chunk	+0 lines, -8 lines	0 comments	Download
M	ash/shelf/shelf_layout_manager.cc	View		6 chunks	+18 lines, -50 lines	0 comments	Download
M	ash/shelf/shelf_model.cc	View		2 chunks	+19 lines, -40 lines	0 comments	Download
M	ash/shelf/shelf_model_unittest.cc	View		2 chunks	+0 lines, -113 lines	0 comments	Download
M	ash/shelf/shelf_navigator_unittest.cc	View		5 chunks	+0 lines, -65 lines	0 comments	Download
M	ash/shelf/shelf_view.h	View		2 chunks	+0 lines, -11 lines	0 comments	Download
M	ash/shelf/shelf_view.cc	View		19 chunks	+21 lines, -154 lines	0 comments	Download
M	ash/shelf/shelf_view_unittest.cc	View		9 chunks	+3 lines, -181 lines	0 comments	Download
M	ash/system/chromeos/session/logout_button_tray.cc	View		1 chunk	+1 line, -1 line	0 comments	Download
M	ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc	View		2 chunks	+2 lines, -1 line	0 comments	Download
M	ash/system/status_area_widget_delegate.cc	View		4 chunks	+2 lines, -20 lines	0 comments	Download
M	ash/system/tray/system_tray.cc	View	1	3 chunks	+5 lines, -9 lines	0 comments	Download
M	ash/system/tray/tray_background_view.cc	View		11 chunks	+43 lines, -145 lines	0 comments	Download
M	ash/system/tray/tray_constants.h	View	1	2 chunks	+7 lines, -11 lines	0 comments	Download
M	ash/system/tray/tray_constants.cc	View	1	2 chunks	+8 lines, -20 lines	0 comments	Download
M	ash/system/user/tray_user.cc	View	1	5 chunks	+10 lines, -28 lines	0 comments	Download
M	ash/system/web_notification/web_notification_tray.cc	View		7 chunks	+8 lines, -12 lines	0 comments	Download
M	ash/test/shelf_view_test_api.cc	View		2 chunks	+3 lines, -2 lines	0 comments	Download
M	ash/wm/app_list_controller.cc	View		2 chunks	+1 line, -9 lines	0 comments	Download
M	chrome/browser/about_flags.cc	View	1	1 chunk	+0 lines, -8 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	1	4 chunks	+5 lines, -11 lines	0 comments	Download
M	chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc	View		2 chunks	+2 lines, -1 line	0 comments	Download
M	chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc	View	1	3 chunks	+0 lines, -216 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: 7 (0 generated)

Expand Messages | Collapse Messages

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/harrym@chromium.org/229453005/1

6 years, 8 months ago (2014-04-09 02:25:45 UTC) #2

commit-bot: I haz the power

The CQ bit was unchecked by commit-bot@chromium.org

6 years, 8 months ago (2014-04-09 02:25:55 UTC) #3

commit-bot: I haz the power

Failed to apply patch for ash/resources/ash_resources.grd: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

6 years, 8 months ago (2014-04-09 02:25:56 UTC) #4

Failed to apply patch for ash/resources/ash_resources.grd:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ash/resources/ash_resources.grd
  Hunk #1 FAILED at 46.
  1 out of 1 hunk FAILED -- saving rejects to file
ash/resources/ash_resources.grd.rej

Patch:       ash/resources/ash_resources.grd
Index: ash/resources/ash_resources.grd
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index
75c3a6971cc4c4e7e68fb195e62f2cc14f57726b..523b2424e5740c105e103d6d357b38dcfde5da0b
100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -46,18 +46,14 @@
       <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BACKGROUND"
file="common/launcher/launcher_background.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_CORNER"
file="common/launcher/launcher_corner.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_DIMMING"
file="common/launcher/launcher_dimming.png" />
-      <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_ICON_APPLIST"
file="common/launcher/launcher_appmenu.png" />
-      <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_ICON_APPLIST_ALTERNATE"
file="common/alt_launcher/status_app_menu_icon.png" />
+      <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_ICON_APPLIST"
file="common/alt_launcher/status_app_menu_icon.png" />
       <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_ICON_APPLIST_HOT"
file="common/launcher/launcher_appmenu_hover.png" />
       <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED"
file="common/launcher/launcher_appmenu_pressed.png" />
       <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_LIST_BROWSER"
file="common/launcher/window_switcher_icon_normal.png" />
       <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_LIST_INCOGNITO_BROWSER"
file="common/launcher/window_switcher_icon_incognito.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_OVERFLOW"
file="common/launcher/launcher_overflow.png" />
-      <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE"
file="common/launcher/launcher_underline_bottom_active.png" />
-      <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE_ALTERNATE"
file="common/alt_launcher/launcher_underline_active.png" />
-      <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_UNDERLINE_HOVER"
file="common/launcher/launcher_underline_bottom_hover.png" />
-      <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_UNDERLINE_RUNNING"
file="common/launcher/launcher_underline_bottom_running.png" />
-      <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_UNDERLINE_RUNNING_ALTERNATE"
file="common/alt_launcher/launcher_underline_running.png" />
+      <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE"
file="common/alt_launcher/launcher_underline_active.png" />
+      <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_UNDERLINE_RUNNING"
file="common/alt_launcher/launcher_underline_running.png" />
       <structure type="chrome_scaled_image"
name="IDR_AURA_LAUNCHER_ICON_TASK_MANAGER"
file="common/launcher/task_manager.png" />
       <structure type="chrome_scaled_image"
name="IDR_AURA_MULTI_WINDOW_RESIZE_H"
file="common/multi_window_resize_horizontal.png" />
       <structure type="chrome_scaled_image"
name="IDR_AURA_MULTI_WINDOW_RESIZE_V"
file="common/multi_window_resize_vertical.png" />

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/harrym@chromium.org/229453005/20001

6 years, 8 months ago (2014-04-11 22:24:22 UTC) #6

Message was sent while issue was closed.

Change committed as 263451

Expand Messages | Collapse Messages