summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Mineer <amineer@chromium.org>2015-04-27 10:43:32 -0700
committerAlex Mineer <amineer@chromium.org>2015-04-27 17:44:09 +0000
commit038195203c86def7ccefb86b9b868dce3247011e (patch)
treeaa955021569f6892d5823f762e44df128659dc18
parentffcc531fe5daf52d766c99a384c0f229b57f9759 (diff)
downloadchromium_src-038195203c86def7ccefb86b9b868dce3247011e.zip
chromium_src-038195203c86def7ccefb86b9b868dce3247011e.tar.gz
chromium_src-038195203c86def7ccefb86b9b868dce3247011e.tar.bz2
Revert "mac: Tentative fix for Yosemite open file crash."
This reverts commit 192b9d9cfe388a6cfb76b9aea56070da1d878a81. Reverting on M42 release branch for next stable push. BUG=479097 Cr-Commit-Position: refs/branch-heads/2311@{#504} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
-rw-r--r--chrome/browser/chrome_browser_main_mac.mm9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
index 98c1591..7ab2520 100644
--- a/chrome/browser/chrome_browser_main_mac.mm
+++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -259,14 +259,7 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {
// in the window server, which is the default when not not using the
// 10.9 SDK.
// TODO: Remove this when we build with the 10.9 SDK.
- @"NSWindowHostsLayersInWindowServer":
- @(base::mac::IsOSMavericksOrLater()),
- // This setting prevents views from ditching their layers when the view
- // gets removed from the view hierarchy. It defaults to YES for
- // applications linked against an OSX 10.8+ SDK. In Yosemite, failing to
- // set this to YES causes an AppKit crash. http://crbug.com/428977
- // TODO(erikchen): Remove this when we build with an OSX 10.8+ SDK.
- @"NSViewKeepLayersAround": @(YES)
+ @"NSWindowHostsLayersInWindowServer": @(base::mac::IsOSMavericksOrLater())
}];
}