remove kDisableMinimizeOnSecondLauncherItemClick

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 <stddef.h>
 
 #include <vector>
 
@@ skipping 1139 matching lines @@
     if (!manager->IsWindowOnDesktopOfUser(native_window, current_account_id)) {
       ash::MultiProfileUMA::RecordTeleportAction(
           ash::MultiProfileUMA::TELEPORT_WINDOW_RETURN_BY_LAUNCHER);
       manager->ShowWindowForUser(native_window, current_account_id);
       window->Activate();
       return ash::ShelfItemDelegate::kExistingWindowActivated;
     }
   }
 
   if (window->IsActive() && allow_minimize) {
-    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kDisableMinimizeOnSecondLauncherItemClick)) {
-      AnimateWindow(window->GetNativeWindow(),
-                    wm::WINDOW_ANIMATION_TYPE_BOUNCE);
-    } else {
-      window->Minimize();
-      return ash::ShelfItemDelegate::kExistingWindowMinimized;
-    }
-  } else {
-    window->Show();
-    window->Activate();
-    return ash::ShelfItemDelegate::kExistingWindowActivated;
+    window->Minimize();
+    return ash::ShelfItemDelegate::kNoAction;
   }
-  return ash::ShelfItemDelegate::kNoAction;
+
+  window->Show();
+  window->Activate();
+  return ash::ShelfItemDelegate::kExistingWindowActivated;
 }
 
 void ChromeLauncherController::OnShelfCreated(ash::Shelf* shelf) {
   shelves_.insert(shelf);
   shelf->shelf_widget()->shelf_layout_manager()->AddObserver(this);
 }
 
 void ChromeLauncherController::OnShelfDestroyed(ash::Shelf* shelf) {
   shelves_.erase(shelf);
   // RemoveObserver is not called here, since by the time this method is called
@@ skipping 1040 matching lines @@
 void ChromeLauncherController::ReleaseProfile() {
   if (app_sync_ui_state_)
     app_sync_ui_state_->RemoveObserver(this);
 
   extensions::ExtensionRegistry::Get(profile_)->RemoveObserver(this);
 
   PrefServiceSyncableFromProfile(profile_)->RemoveObserver(this);
 
   pref_change_registrar_.RemoveAll();
 }