Fix window restore behaviour on Mac.

chrome/browser/sessions/session_service.cc

 // Copyright (c) 2006-2008 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 "build/build_config.h"
 
 #include "chrome/browser/sessions/session_service.h"
 
 #include <limits>
 
@@ skipping 11 matching lines @@
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_command.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
 
+#if defined(OS_MACOSX)
+#include "chrome/browser/app_controller_cppsafe_mac.h"
+#endif
+
 using base::Time;
 
 // Identifier for commands written to file.
 static const SessionCommand::id_type kCommandSetTabWindow = 0;
 // kCommandSetWindowBounds is no longer used (it's superseded by
 // kCommandSetWindowBounds2). I leave it here to document what it was.
 // static const SessionCommand::id_type kCommandSetWindowBounds = 1;
 static const SessionCommand::id_type kCommandSetTabIndexInWindow = 2;
 static const SessionCommand::id_type kCommandTabClosed = 3;
 static const SessionCommand::id_type kCommandWindowClosed = 4;
@@ skipping 360 matching lines @@
                              const NotificationDetails& details) {
   // All of our messages have the NavigationController as the source.
   switch (type.value) {
     case NotificationType::BROWSER_OPENED: {
       Browser* browser = Source<Browser>(source).ptr();
       if (browser->profile() != profile() ||
           !should_track_changes_for_browser_type(browser->type())) {
         return;
       }
 
-      if (!has_open_trackable_browsers_ && !BrowserInit::InProcessStartup()) {
+      if (!has_open_trackable_browsers_ && !BrowserInit::InProcessStartup()
+#if defined(OS_MACOSX)
+          // OSX has a fairly different idea of application lifetime than the
+          // other platforms. We need to check that we aren't opening a window
+          // from the dock or the menubar.
+          && !app_controller_mac::IsOpeningNewWindow()
+#endif
+          ) {
         // We're going from no tabbed browsers to a tabbed browser (and not in
         // process startup), restore the last session.
         if (move_on_new_browser_) {
           // Make the current session the last.
           MoveCurrentSessionToLastSession();
           move_on_new_browser_ = false;
         }
         SessionStartupPref pref = SessionStartupPref::GetStartupPref(profile());
         if (pref.type == SessionStartupPref::LAST) {
           SessionRestore::RestoreSession(
@@ skipping 722 matching lines @@
         browser->profile()->GetOriginalProfile() == profile()) {
       return true;
     }
   }
   return false;
 }
 
 bool SessionService::ShouldTrackChangesToWindow(const SessionID& window_id) {
   return windows_tracking_.find(window_id.id()) != windows_tracking_.end();
 }