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

Unified Diff: chrome/browser/ui/cocoa/browser_window_cocoa.mm

Issue 1358333002: (Merge to M45): Revert of BrowserWindowCocoa::Show should activate the window (patchset #1 id:1 of … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2454
Patch Set: Created 5 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/browser_window_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index 83c8ba37b586f1348087af2583f4677bdc834148..7eec4ac95a76ff77f7fb524c6fb5c2f747cd3568 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -168,11 +168,11 @@ void BrowserWindowCocoa::Show() {
}
{
- 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:|
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698