Chromium Code Reviews| Index: base/mac/mac_util.mm |
| diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm |
| index 75d53c90961086c6225b352981d181a8d5733524..cb4eb666499c67e01e9d6a70ae5003e411304ee5 100644 |
| --- a/base/mac/mac_util.mm |
| +++ b/base/mac/mac_util.mm |
| @@ -358,7 +358,7 @@ bool WasLaunchedAsLoginOrResumeItem() { |
| bool WasLaunchedAsLoginItemRestoreState() { |
| // "Reopen windows..." option was added for Lion. Prior OS versions should |
| // not have this behavior. |
| - if (IsOSSnowLeopard() || !WasLaunchedAsLoginOrResumeItem()) |
| + if (!WasLaunchedAsLoginOrResumeItem()) |
| return false; |
| CFStringRef app = CFSTR("com.apple.loginwindow"); |
| @@ -385,12 +385,7 @@ bool WasLaunchedAsHiddenLoginItem() { |
| ScopedCFTypeRef<LSSharedFileListItemRef> item(GetLoginItemForApp()); |
| if (!item.get()) { |
| - // Lion can launch items for the resume feature. So log an error only for |
| - // Snow Leopard or earlier. |
| - if (IsOSSnowLeopard()) |
| - DLOG(ERROR) << |
| - "Process launched at Login but can't access Login Item List."; |
| - |
| + // OS X can launch items for the resume feature |
|
Robert Sesek
2016/04/01 21:24:42
nit: punctuation
Nico
2016/04/01 21:29:10
Done.
|
| return false; |
| } |
| return IsHiddenLoginItem(item); |
| @@ -488,12 +483,6 @@ enum { |
| } // namespace |
| -#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_7) |
| -bool IsOSSnowLeopard() { |
| - return MacOSXMinorVersion() == SNOW_LEOPARD_MINOR_VERSION; |
| -} |
| -#endif |
| - |
| #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_7) |
| bool IsOSLion() { |
| return MacOSXMinorVersion() == LION_MINOR_VERSION; |