Adding a minimize function for clicks on launcher items if only a single item (already active) is a…

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

 // Copyright (c) 2012 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_per_app.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher_model.h"
@@ skipping 52 matching lines @@
 #include "extensions/common/extension_resource.h"
 #include "extensions/common/url_pattern.h"
 #include "grit/ash_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/views/corewm/window_animations.h"
 
 using extensions::Extension;
 using content::WebContents;
 
 namespace {
 
 std::string GetPrefKeyForRootWindow(aura::RootWindow* root_window) {
   gfx::Display display = gfx::Screen::GetScreenFor(
       root_window)->GetDisplayNearestWindow(root_window);
   DCHECK(display.is_valid());
@@ skipping 783 matching lines @@
   } else {
     NOTREACHED() << "Invalid launcher type";
   }
 }
 
 const Extension* ChromeLauncherControllerPerApp::GetExtensionForAppID(
     const std::string& app_id) const {
   return profile_->GetExtensionService()->GetInstalledExtension(app_id);
 }
 
+void ChromeLauncherControllerPerApp::ActivateWindowOrMinimizeIfActive(
+    BaseWindow* window,
+    bool allow_minimize) {
+  if (window->IsActive() && allow_minimize) {
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kDisableMinimizeOnSecondLauncherItemClick)) {
+      AnimateWindow(window->GetNativeWindow(),
+                    views::corewm::WINDOW_ANIMATION_TYPE_BOUNCE);
+    } else {
+      window->Minimize();
+    }
+  } else {
+    window->Show();
+    window->Activate();
+  }
+}
+
 void ChromeLauncherControllerPerApp::OnBrowserShortcutClicked(
     int event_flags) {
   if (event_flags & ui::EF_CONTROL_DOWN) {
     CreateNewWindow();
     return;
   }
 
   Browser* last_browser = chrome::FindTabbedBrowser(
       GetProfileForNewWindows(), true, chrome::HOST_DESKTOP_TYPE_ASH);
 
   if (!last_browser) {
     CreateNewWindow();
     return;
   }
 
-  aura::Window* window = last_browser->window()->GetNativeWindow();
-  window->Show();
-  ash::wm::ActivateWindow(window);
+  ActivateWindowOrMinimizeIfActive(last_browser->window(),
+                                   GetBrowserApplicationList(0).size() == 2);
 }
 
 void ChromeLauncherControllerPerApp::ItemClicked(const ash::LauncherItem& item,
                                                  const ui::Event& event) {
   DCHECK(HasItemController(item.id));
   id_to_item_controller_map_[item.id]->Clicked(event);
 }
 
 int ChromeLauncherControllerPerApp::GetBrowserShortcutResourceId() {
   return IDR_PRODUCT_LOGO_32;
@@ skipping 694 matching lines @@
            GetLauncherIDForAppID(web_app::GetExtensionIdFromApplicationName(
                browser->app_name())) <= 0));
 }
 
 bool ChromeLauncherControllerPerApp::IsIncognito(
     content::WebContents* web_contents) const {
   const Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   return profile->IsOffTheRecord() && !profile->IsGuestSession();
 }