(Merge to M45): Revert of BrowserWindowCocoa::Show should activate the window (patchset #1 id:1 of …

chrome/browser/ui/cocoa/browser_window_cocoa.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.
 
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #import "base/mac/sdk_forward_declarations.h"
@@ skipping 150 matching lines @@
   // Turn off swishing when restoring windows or showing an app.
   if ((is_session_restore || browser_->is_app()) &&
       [window() respondsToSelector:@selector(animationBehavior)] &&
       [window() respondsToSelector:@selector(setAnimationBehavior:)]) {
     did_save_animation_behavior = true;
     saved_animation_behavior = [window() animationBehavior];
     [window() setAnimationBehavior:NSWindowAnimationBehaviorNone];
   }
 
   {
-    TRACE_EVENT0("ui", "BrowserWindowCocoa::Show Activate");
+    TRACE_EVENT0("ui", "BrowserWindowCocoa::Show makeKeyAndOrderFront");
     // This call takes up a substantial part of startup time, and an even more
     // substantial part of startup time when any CALayers are part of the
     // window's NSView heirarchy.
-    Activate();
+    [window() makeKeyAndOrderFront:controller_];
   }
 
   // When creating windows from nibs it is necessary to |makeKeyAndOrderFront:|
   // prior to |orderOut:| then |miniaturize:| when restoring windows in the
   // minimized state.
   if (initial_show_state_ == ui::SHOW_STATE_MINIMIZED) {
     [window() orderOut:controller_];
     [window() miniaturize:controller_];
   } else if (initial_show_state_ == ui::SHOW_STATE_FULLSCREEN) {
     chrome::ToggleFullscreenWithToolbarOrFallback(browser_);
@@ skipping 659 matching lines @@
 void BrowserWindowCocoa::UnhideDownloadShelf() {
   GetDownloadShelf()->Unhide();
 }
 
 void BrowserWindowCocoa::HideDownloadShelf() {
   GetDownloadShelf()->Hide();
   StatusBubble* statusBubble = GetStatusBubble();
   if (statusBubble)
     statusBubble->Hide();
 }