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

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 1816 matching lines @@
     if (*chrome_index != -1 &&
         *app_list_index < *chrome_index &&
         target_index > *chrome_index)
       --(*chrome_index);
     *app_list_index = -1;
   }
 }
 
 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 ||
         ((is_app_list || alternate) && type == ash::TYPE_APP_LIST) ||
         type == ash::TYPE_BROWSER_SHORTCUT ||
         type == ash::TYPE_WINDOWED_APP)
       return i;
   }
   return 0;
 }
@@ skipping 168 matching lines @@
 }
 
 void ChromeLauncherController::ReleaseProfile() {
   if (app_sync_ui_state_)
     app_sync_ui_state_->RemoveObserver(this);
 
   PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
 
   pref_change_registrar_.RemoveAll();
 }