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 dd9c48e7d535ef4308e8b2feebaf4d713aa76fe7..8fae8086cd892cc450b76de368fa32f274c93a84 100644 |
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
@@ -1157,20 +1157,13 @@ ChromeLauncherController::ActivateWindowOrMinimizeIfActive( |
} |
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) { |