Revert of Shelf Cleanup (- binary files)

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 1073 matching lines @@
 void ChromeLauncherController::OnShelfDestroyed(ash::Shelf* shelf) {
   shelves_.erase(shelf);
   // RemoveObserver is not called here, since by the time this method is called
   // Shelf is already in its destructor.
 }
 
 void ChromeLauncherController::ShelfItemAdded(int index) {
   // The app list launcher can get added to the shelf after we applied the
   // preferences. In that case the item might be at the wrong spot. As such we
   // call the function again.
-  if (model_->items()[index].type == ash::TYPE_APP_LIST)
+  if (model_->items()[index].type == ash::TYPE_APP_LIST &&
+      ash::switches::UseAlternateShelfLayout())
     UpdateAppLaunchersFromPref();
 }
 
 void ChromeLauncherController::ShelfItemRemoved(int index, ash::ShelfID id) {
 }
 
 void ChromeLauncherController::ShelfItemMoved(int start_index,
                                               int target_index) {
   const ash::ShelfItem& item = model_->items()[target_index];
   // We remember the moved item position if it is either pinnable or
   // it is the app list with the alternate shelf layout.
   if ((HasItemController(item.id) && IsPinned(item.id)) ||
-       item.type == ash::TYPE_APP_LIST)
+      (ash::switches::UseAlternateShelfLayout() &&
+       item.type == ash::TYPE_APP_LIST))
     PersistPinnedState();
 }
 
 void ChromeLauncherController::ShelfItemChanged(
     int index,
     const ash::ShelfItem& old_item) {
 }
 
 void ChromeLauncherController::ShelfStatusChanged() {
 }
@@ skipping 742 matching lines @@
     model_->Move(*app_list_index, target_index);
     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.
-  if (is_app_list)
+  if (is_app_list && alternate)
     return 0;
 
   for (int i = model_->item_count() - 1; i > 0; --i) {
     ash::ShelfItemType type = model_->items()[i].type;
     if (type == ash::TYPE_APP_SHORTCUT ||
-        type == ash::TYPE_APP_LIST ||
+        ((is_app_list || alternate) && type == ash::TYPE_APP_LIST) ||
         type == ash::TYPE_BROWSER_SHORTCUT ||
         type == ash::TYPE_WINDOWED_APP)
       return i;
   }
   return 0;
 }
 
 int ChromeLauncherController::GetChromeIconIndexForCreation() {
   // We get the list of pinned apps as they currently would get pinned.
   // Within this list the chrome icon will be the correct location.
@@ skipping 68 matching lines @@
       }
     }
   }
 
   // If not added yet, the chrome item will be the last item in the list.
   if (!chrome_icon_added)
     pinned_apps.push_back(extension_misc::kChromeAppId);
 
   // If not added yet, add the app list item either at the end or at the
   // beginning - depending on the shelf layout.
-  if (!app_list_icon_added)
-    pinned_apps.insert(pinned_apps.begin(), kAppShelfIdPlaceholder);
+  if (!app_list_icon_added) {
+    if (ash::switches::UseAlternateShelfLayout())
+      pinned_apps.insert(pinned_apps.begin(), kAppShelfIdPlaceholder);
+    else
+      pinned_apps.push_back(kAppShelfIdPlaceholder);
+  }
   return pinned_apps;
 }
 
 bool ChromeLauncherController::IsIncognito(
     const content::WebContents* web_contents) const {
   const Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   return profile->IsOffTheRecord() && !profile->IsGuestSession();
 }
 
@@ skipping 70 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();
 }