Fix window restore behaviour on Mac.

chrome/browser/app_controller_mac.mm

 // Copyright (c) 2009 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.
 
 #import "chrome/browser/app_controller_mac.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/command_line.h"
 #include "base/mac_util.h"
 #include "base/message_loop.h"
@@ skipping 35 matching lines @@
 - (void)openPendingURLs;
 - (void)getUrl:(NSAppleEventDescriptor*)event
      withReply:(NSAppleEventDescriptor*)reply;
 - (void)openFiles:(NSAppleEventDescriptor*)event
         withReply:(NSAppleEventDescriptor*)reply;
 - (void)windowLayeringDidChange:(NSNotification*)inNotification;
 - (BOOL)userWillWaitForInProgressDownloads:(int)downloadCount;
 - (BOOL)shouldQuitWithInProgressDownloads;
 @end
 
+// True while AppController is calling Browser::OpenEmptyWindow(). We need a
+// global flag here, analogue to BrowserInit::InProcessStartup() because
+// otherwise the SessionService will try to restore sessions when we make a new
+// window while there are no other active windows.
+static bool g_is_opening_new_window = false;
+
 @implementation AppController
 
 // This method is called very early in application startup (ie, before
 // the profile is loaded or any preferences have been registered). Defer any
 // user-data initialization until -applicationDidFinishLaunching:.
 - (void)awakeFromNib {
   pendingURLs_.reset(new std::vector<GURL>());
 
   // We need to register the handlers early to catch events fired on launch.
   NSAppleEventManager* em = [NSAppleEventManager sharedAppleEventManager];
@@ skipping 416 matching lines @@
 // through to the browser object to execute the command. This assumes that the
 // command is supported and doesn't check, otherwise it would have been disabled
 // in the UI in validateUserInterfaceItem:.
 - (void)commandDispatch:(id)sender {
   Profile* defaultProfile = [self defaultProfile];
 
   NSInteger tag = [sender tag];
   switch (tag) {
     case IDC_NEW_TAB:
     case IDC_NEW_WINDOW:
+      g_is_opening_new_window = true;
       Browser::OpenEmptyWindow(defaultProfile);
+      g_is_opening_new_window = false;
       break;
     case IDC_NEW_INCOGNITO_WINDOW:
       Browser::OpenEmptyWindow(defaultProfile->GetOffTheRecordProfile());
       break;
     case IDC_RESTORE_TAB:
       Browser::OpenWindowWithRestoredTabs(defaultProfile);
       break;
     case IDC_OPEN_FILE:
       Browser::OpenEmptyWindow(defaultProfile);
       BrowserList::GetLastActive()->
@@ skipping 17 matching lines @@
 // dock icon and there are no open windows.  To match standard mac
 // behavior, we should open a new window.
 - (BOOL)applicationShouldHandleReopen:(NSApplication*)theApplication
                     hasVisibleWindows:(BOOL)flag {
   // Don't do anything if there are visible windows.  This will cause
   // AppKit to unminimize the most recently minimized window.
   if (flag)
     return YES;
 
   // Otherwise open a new window.
+  g_is_opening_new_window = true;
   Browser::OpenEmptyWindow([self defaultProfile]);
+  g_is_opening_new_window = false;
 
   // We've handled the reopen event, so return NO to tell AppKit not
   // to do anything.
   return NO;
 }
 
 - (void)initMenuState {
   menuState_.reset(new CommandUpdater(NULL));
   menuState_->UpdateCommandEnabled(IDC_NEW_TAB, true);
   menuState_->UpdateCommandEnabled(IDC_NEW_WINDOW, true);
@@ skipping 181 matching lines @@
 @end
 
 //---------------------------------------------------------------------------
 
 // Stub for cross-platform method that isn't called on Mac OS X.
 void ShowOptionsWindow(OptionsPage page,
                        OptionsGroup highlight_group,
                        Profile* profile) {
   NOTIMPLEMENTED();
 }
+
+namespace app_controller_mac {
+
+bool IsOpeningNewWindow() {
+  return g_is_opening_new_window;
+}
+
+}  // namespace app_controller_mac