Shelf Cleanup (- binary files)

Shelf Cleanup (- binary files)

R=skuhne@chromium.org
TBR=jamescook@chromium.org, miket@chromium.org, skuhne@chromium.org
BUG=338429
re-landing of
https://codereview.chromium.org/140323010/ hopefully this time with less breaking everything.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256319

[Mr4D (OOO till 08-26), 2014-03-04 01:12:17]

Looked at the changes between the first land and this and it's lgtm

[Harry McCleave, 2014-03-04 01:13:04]

The CQ bit was checked by harrym@chromium.org

[commit-bot: I haz the power, 2014-03-04 01:16:34]

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

[Harry McCleave, 2014-03-04 02:37:13]

The CQ bit was unchecked by harrym@chromium.org

[Harry McCleave, 2014-03-04 02:40:03]

The CQ bit was checked by harrym@chromium.org

[commit-bot: I haz the power, 2014-03-04 02:42:50]

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

[commit-bot: I haz the power, 2014-03-04 06:25:07]

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

[commit-bot: I haz the power, 2014-03-04 06:25:07]

Retried try job too often on linux_chromeos for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[Harry McCleave, 2014-03-04 19:09:18]

The CQ bit was checked by harrym@chromium.org

[commit-bot: I haz the power, 2014-03-04 19:11:52]

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

[commit-bot: I haz the power, 2014-03-04 20:32:18]

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

[commit-bot: I haz the power, 2014-03-04 20:32:19]

Retried try job too often on win_rel for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[Harry McCleave, 2014-03-04 21:03:29]

The CQ bit was checked by harrym@chromium.org

[commit-bot: I haz the power, 2014-03-04 21:05:49]

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

[commit-bot: I haz the power, 2014-03-05 00:48:18]

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

[Harry McCleave, 2014-03-05 01:26:16]

The CQ bit was unchecked by harrym@chromium.org

[Harry McCleave, 2014-03-05 01:49:16]

The CQ bit was checked by harrym@chromium.org

[commit-bot: I haz the power, 2014-03-05 02:04:34]

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

[commit-bot: I haz the power, 2014-03-05 06:17:02]

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

[commit-bot: I haz the power, 2014-03-05 06:17:03]

Try jobs failed on following builders: linux_chromium_chromeos_clang_dbg

[Harry McCleave, 2014-03-05 20:53:33]

The CQ bit was checked by harrym@chromium.org

[commit-bot: I haz the power, 2014-03-05 20:54:39]

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

[commit-bot: I haz the power, 2014-03-05 20:54:53]

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

[commit-bot: I haz the power, 2014-03-05 20:54:54]

Failed to apply patch for ash/ash_switches.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ash/ash_switches.cc
  Hunk #1 FAILED at 47.
  Hunk #2 succeeded at 127 (offset -14 lines).
  Hunk #3 succeeded at 150 (offset -14 lines).
  1 out of 3 hunks FAILED -- saving rejects to file ash/ash_switches.cc.rej

Patch:       ash/ash_switches.cc
Index: ash/ash_switches.cc
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index
51ecfc605320f1caca2a91e592d08c87e4449845..a86d433497376d76f64c7d3968c725f17b0c2b3c
100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -47,10 +47,6 @@ const char kAshDefaultWallpaperSmall[] =
"ash-default-wallpaper-small";
 const char kAshDisableAlternateFrameCaptionButtonStyle[] =
     "ash-disable-alternate-caption-button";
 
-// Disable the alternate shelf layout.
-const char kAshDisableAlternateShelfLayout[] =
-    "ash-disable-alternate-shelf-layout";
-
 #if defined(OS_CHROMEOS)
 // Disable the status tray volume menu for allowing the user to choose an audio
 // input and output device.
@@ -141,14 +137,6 @@ const char kAshSecondaryDisplayLayout[] =
"ash-secondary-display-layout";
 // Enables the heads-up display for tracking touch points.
 const char kAshTouchHud[] = "ash-touch-hud";
 
-// Use alternate layout of the shelf for testing a new look and feel:
-// Slightly smaller profile, only 2 states for the "bar highlight" on
-// launcher buttons, app list icon with more visible state indication,
-// app list icon repositionable and defaulting as 1st item in shelf,
-// more visible state indication for background on status area.
-// crbug's [244983, 244990, 244994, 245005, 245012]
-const char kAshUseAlternateShelfLayout[] = "ash-use-alternate-shelf";
-
 // Uses the 1st display in --ash-host-window-bounds as internal display.
 // This is for debugging on linux desktop.
 const char kAshUseFirstDisplayAsInternal[] =
@@ -172,11 +160,6 @@ bool UseAlternateFrameCaptionButtonStyle() {
       HasSwitch(kAshDisableAlternateFrameCaptionButtonStyle);
 }
 
-bool UseAlternateShelfLayout() {
-  return !CommandLine::ForCurrentProcess()->
-      HasSwitch(kAshDisableAlternateShelfLayout);
-}
-
 bool UseDragOffShelf() {
   return !CommandLine::ForCurrentProcess()->
       HasSwitch(kAshDisableDragOffShelf);

[Harry McCleave, 2014-03-05 22:17:01]

The CQ bit was checked by harrym@chromium.org

[commit-bot: I haz the power, 2014-03-05 22:18:17]

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

[commit-bot: I haz the power, 2014-03-05 22:35:03]

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

[commit-bot: I haz the power, 2014-03-05 22:35:04]

Retried try job too often on win_rel for step(s) app_list_unittests,
ash_unittests, aura_unittests, cacheinvalidation_unittests, cc_unittests,
check_deps, check_deps2git, chrome_elf_unittests, chromedriver_unittests,
components_unittests, compositor_unittests, content_browsertests,
content_unittests, crypto_unittests, events_unittests, gfx_unittests,
google_apis_unittests, gpu_unittests, installer_util_unittests, ipc_tests,
jingle_unittests, media_unittests, mini_installer_test, nacl_integration,
ppapi_unittests, printing_unittests, remoting_unittests, sql_unittests,
sync_integration_tests, sync_unit_tests, telemetry_perf_unittests,
telemetry_unittests, views_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[Harry McCleave, 2014-03-06 01:23:37]

The CQ bit was checked by harrym@chromium.org

[commit-bot: I haz the power, 2014-03-06 01:25:50]

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

[commit-bot: I haz the power, 2014-03-06 02:55:56]

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

[commit-bot: I haz the power, 2014-03-06 03:19:38]

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

[commit-bot: I haz the power, 2014-03-06 12:59:17]

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

[commit-bot: I haz the power, 2014-03-06 12:59:18]

Failed to apply patch for ash/system/logout_button/logout_button_tray.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 6
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: ash/system/logout_button/logout_button_tray.cc
  |diff --git a/ash/system/logout_button/logout_button_tray.cc
b/ash/system/logout_button/logout_button_tray.cc
  |index
aaa00392b201711315a24dc0c448ec9916ff8335..0bebcb81686aadb01da93da0470385bc6a21dd32
100644
  |--- a/ash/system/logout_button/logout_button_tray.cc
  |+++ b/ash/system/logout_button/logout_button_tray.cc
  --------------------------
  No file to patch.  Skipping patch.
  1 out of 1 hunk ignored

Patch:       ash/system/logout_button/logout_button_tray.cc
Index: ash/system/logout_button/logout_button_tray.cc
diff --git a/ash/system/logout_button/logout_button_tray.cc
b/ash/system/logout_button/logout_button_tray.cc
index
aaa00392b201711315a24dc0c448ec9916ff8335..0bebcb81686aadb01da93da0470385bc6a21dd32
100644
--- a/ash/system/logout_button/logout_button_tray.cc
+++ b/ash/system/logout_button/logout_button_tray.cc
@@ -101,7 +101,7 @@ LogoutButton::LogoutButton(views::ButtonListener* listener)
   SetBorder(border.PassAs<views::Border>());
   set_animate_on_state_change(false);
 
-  set_min_size(gfx::Size(0, GetShelfItemHeight()));
+  set_min_size(gfx::Size(0, kShelfItemHeight));
 }
 
 LogoutButton::~LogoutButton() {

[Harry McCleave, 2014-03-06 21:27:52]

The CQ bit was checked by harrym@chromium.org

[commit-bot: I haz the power, 2014-03-06 21:29:35]

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

[commit-bot: I haz the power, 2014-03-06 22:09:36]

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

[commit-bot: I haz the power, 2014-03-06 22:46:08]

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

[commit-bot: I haz the power, 2014-03-06 22:46:09]

Try jobs failed on following builders: mac_chromium_rel

[Harry McCleave, 2014-03-06 22:53:21]

The CQ bit was checked by harrym@chromium.org

[commit-bot: I haz the power, 2014-03-06 23:02:47]

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

[commit-bot: I haz the power, 2014-03-07 00:46:15]

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

[commit-bot: I haz the power, 2014-03-07 00:46:16]

Try jobs failed on following builders: mac_chromium_rel

[Harry McCleave, 2014-03-07 04:03:10]

The CQ bit was checked by harrym@chromium.org

[commit-bot: I haz the power, 2014-03-07 04:05:10]

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

[commit-bot: I haz the power, 2014-03-07 05:57:26]

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

[commit-bot: I haz the power, 2014-03-07 05:57:27]

Try jobs failed on following builders: mac_chromium_rel

[James Cook, 2014-03-07 17:09:12]

Wow, this is taking a comically large number of attempts to land. You might want
to let the infrastructure people know.

[Harry McCleave, 2014-03-07 20:20:02]

The CQ bit was checked by harrym@chromium.org

[Harry McCleave, 2014-03-07 20:23:41]

The CQ bit was unchecked by harrym@chromium.org

[Harry McCleave, 2014-03-07 20:41:12]

The CQ bit was checked by harrym@chromium.org

[commit-bot: I haz the power, 2014-03-07 20:43:10]

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

[commit-bot: I haz the power, 2014-03-08 10:56:43]

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

[commit-bot: I haz the power, 2014-03-08 13:54:54]

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

[commit-bot: I haz the power, 2014-03-08 13:54:56]

Retried try job too often on mac_rel for step(s) telemetry_perf_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[Harry McCleave, 2014-03-10 23:19:29]

The CQ bit was checked by harrym@chromium.org

[commit-bot: I haz the power, 2014-03-10 23:26:31]

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

[commit-bot: I haz the power, 2014-03-11 00:06:07]

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

[commit-bot: I haz the power, 2014-03-11 06:08:40]

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

[commit-bot: I haz the power, 2014-03-11 06:08:41]

Retried try job too often on mac_rel for step(s) telemetry_perf_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[Harry McCleave, 2014-03-11 21:46:45]

Committed patchset #13 manually as r256319 (presubmit successful).

[jennyz, 2014-03-12 21:36:38]

A revert of this CL has been created in
https://codereview.chromium.org/198063003/ by jennyz@chromium.org.

The reason for reverting is: This cl is breaking the app list launch bubble. see
crbug.com/351776..