Fixing problem with M33->M32->M33 transitions & pinned app preferences

chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index d80e3d8754af1017546ad750cbb7d02435de3514..b68c7335eea2c4bb6d6632eeca375ef80e0b72a5 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -1834,6 +1834,13 @@ void ChromeLauncherController::MoveChromeOrApplistToFinalPosition(
 
 int ChromeLauncherController::FindInsertionPoint(bool is_app_list) {
   bool alternate = ash::switches::UseAlternateShelfLayout();
+  // Keeping this change small to backport to M33&32 (see crbug.com/329597).
+  // TODO(skuhne): With the removal of the legacy shelf layout we should remove
+  // the ability to move the app list item since this was never used. We should
+  // instead ask the ShelfModel::ValidateInsertionIndex or similir for an index.

[Daniel Erat, 2013/12/19 16:59:46]

nit: s/similir/similar/

+  if (is_app_list && alternate)
+    return 0;
+
   for (int i = model_->item_count() - 1; i > 0; --i) {
     ash::LauncherItemType type = model_->items()[i].type;
     if (type == ash::TYPE_APP_SHORTCUT ||