Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6099)

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Issue 1703403002: remove kDisableMinimizeOnSecondLauncherItemClick (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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) {
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698