Mac Lion: Chrome opens new window on restart when no windows were previously open

base/mac/mac_util.mm

 // Copyright (c) 2011 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 "base/mac/mac_util.h"
 
 #import <Cocoa/Cocoa.h>
 #include <string.h>
 #include <sys/utsname.h>
 
@@ skipping 38 matching lines @@
   } else if (g_full_screen_requests[kFullScreenModeHideDock] > 0) {
     desired_mode = kUIModeContentHidden;
   } else if (g_full_screen_requests[kFullScreenModeHideAll] > 0) {
     desired_mode = kUIModeAllHidden;
   }
 
   if (current_mode != desired_mode)
     SetSystemUIMode(desired_mode, desired_options);
 }
 
-bool WasLaunchedAsLoginItem() {
-  ProcessSerialNumber psn = { 0, kCurrentProcess };
-
-  scoped_nsobject<NSDictionary> process_info(
-      CFToNSCast(ProcessInformationCopyDictionary(&psn,
-                     kProcessDictionaryIncludeAllInformationMask)));
-
-  long long temp = [[process_info objectForKey:@"ParentPSN"] longLongValue];
-  ProcessSerialNumber parent_psn =
-      { (temp >> 32) & 0x00000000FFFFFFFFLL, temp & 0x00000000FFFFFFFFLL };
-
-  scoped_nsobject<NSDictionary> parent_info(
-      CFToNSCast(ProcessInformationCopyDictionary(&parent_psn,
-                     kProcessDictionaryIncludeAllInformationMask)));
-
-  // Check that creator process code is that of loginwindow.
-  BOOL result =
-      [[parent_info objectForKey:@"FileCreator"] isEqualToString:@"lgnw"];
-
-  return result == YES;
-}
-
 // Looks into Shared File Lists corresponding to Login Items for the item
 // representing the current application. If such an item is found, returns a
 // retained reference to it. Caller is responsible for releasing the reference.
 LSSharedFileListItemRef GetLoginItemForApp() {
   ScopedCFTypeRef<LSSharedFileListRef> login_items(LSSharedFileListCreate(
       NULL, kLSSharedFileListSessionLoginItems, NULL));
 
   if (!login_items.get()) {
     LOG(ERROR) << "Couldn't get a Login Items list.";
     return NULL;
@@ skipping 374 matching lines @@
       NULL, kLSSharedFileListSessionLoginItems, NULL));
 
   if (!login_items.get()) {
     LOG(ERROR) << "Couldn't get a Login Items list.";
     return;
   }
 
   LSSharedFileListItemRemove(login_items, item);
 }
 
+bool WasLaunchedAsLoginOrResumeItem() {
+  ProcessSerialNumber psn = { 0, kCurrentProcess };
+
+  scoped_nsobject<NSDictionary> process_info(
+      CFToNSCast(ProcessInformationCopyDictionary(&psn,
+                     kProcessDictionaryIncludeAllInformationMask)));
+
+  long long temp = [[process_info objectForKey:@"ParentPSN"] longLongValue];
+  ProcessSerialNumber parent_psn =
+      { (temp >> 32) & 0x00000000FFFFFFFFLL, temp & 0x00000000FFFFFFFFLL };
+
+  scoped_nsobject<NSDictionary> parent_info(
+      CFToNSCast(ProcessInformationCopyDictionary(&parent_psn,
+                     kProcessDictionaryIncludeAllInformationMask)));
+
+  // Check that creator process code is that of loginwindow.
+  BOOL result =
+      [[parent_info objectForKey:@"FileCreator"] isEqualToString:@"lgnw"];
+
+  return result == YES;
+}
+
 bool WasLaunchedAsHiddenLoginItem() {
-  if (!WasLaunchedAsLoginItem())
+  if (!WasLaunchedAsLoginOrResumeItem())
     return false;
 
   ScopedCFTypeRef<LSSharedFileListItemRef> item(GetLoginItemForApp());
   if (!item.get()) {
-    LOG(ERROR) << "Process launched at Login but can't access Login Item List.";
+    // Lion can launch items for the resume feature.  So log an error only for
+    // Snow Leopard or earlier.
+    if (IsOSSnowLeopardOrEarlier())
+      LOG(ERROR) <<
+          "Process launched at Login but can't access Login Item List.";
+
     return false;
   }
   return IsHiddenLoginItem(item);
 }
 
 namespace {
 
 // Returns the running system's Darwin major version. Don't call this, it's
 // an implementation detail and its result is meant to be cached by
 // MacOSXMinorVersion.
@@ skipping 116 matching lines @@
 #endif
 
 #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_7)
 bool IsOSLaterThanLion() {
   return MacOSXMinorVersion() > LION_MINOR_VERSION;
 }
 #endif
 
 }  // namespace mac
 }  // namespace base