Mac: Fix window raising for multiple desktops

chrome/browser/app_controller_mac.mm

 // 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.
 
 #import "chrome/browser/app_controller_mac.h"
 
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 #include "apps/shell_window_registry.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 1058 matching lines @@
                     hasVisibleWindows:(BOOL)hasVisibleWindows {
   // If the browser is currently trying to quit, don't do anything and return NO
   // to prevent AppKit from doing anything.
   // TODO(rohitrao): Remove this code when http://crbug.com/40861 is resolved.
   if (browser_shutdown::IsTryingToQuit())
     return NO;
 
   // Bring all browser windows to the front. Specifically, this brings them in
   // front of any app windows. FocusWindowSet will also unminimize the most
   // recently minimized window if no windows in the set are visible.
-  // If there are tabbed or popup windows, return here. Otherwise, the windows
-  // are panels or notifications so we still need to open a new window.
+  // If there are any, return here. Otherwise, the windows are panels or
+  // notifications so we still need to open a new window.
   if (hasVisibleWindows) {
-    BOOL foundBrowser = NO;
     std::set<NSWindow*> browserWindows;
     for (chrome::BrowserIterator iter; !iter.done(); iter.Next()) {
       Browser* browser = *iter;
       browserWindows.insert(browser->window()->GetNativeWindow());
-      if (browser->is_type_tabbed() || browser->is_type_popup())
-        foundBrowser = YES;
     }
-    ui::FocusWindowSet(browserWindows);
-    if (foundBrowser)
-      return YES;
+    if (!browserWindows.empty()) {
+      ui::FocusWindowSet(browserWindows);
+      // Return NO; we've done the unminimize, so AppKit shouldn't do
+      // anything.
+      return NO;
+    }
   }
 
   // If launched as a hidden login item (due to installation of a persistent app
   // or by the user, for example in System Preferences->Accounts->Login Items),
   // allow session to be restored first time the user clicks on a Dock icon.
   // Normally, it'd just open a new empty page.
   {
     static BOOL doneOnce = NO;
     if (!doneOnce) {
       doneOnce = YES;
@@ skipping 320 matching lines @@
 
 //---------------------------------------------------------------------------
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac