Fixing reopening of tabs after relaunch by preventing reentry into AttemptExit process.

chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc

 // Copyright 2012 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 "chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h"
 
 #include "ash/shell.h"
 #include "ash/wm/window_positioner.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_aurawin.h"
+#include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/util.h"
 #include "chrome/browser/ui/ash/ash_init.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
@@ skipping 49 matching lines @@
   // TODO(cpu): At some point we only close the browser. Right now this
   // is very convenient for developing.
   DLOG(INFO) << "viewer channel error : Quitting browser";
 
   // Unset environment variable to let breakpad know that metro process wasn't
   // connected.
   ::SetEnvironmentVariableA(env_vars::kMetroConnected, NULL);
 
   aura::RemoteRootWindowHostWin::Instance()->Disconnected();
   g_browser_process->ReleaseModule();
-  CloseOpenAshBrowsers();
-  chrome::CloseAsh();
+
+  // If browser is trying to quit, we shouldn't reenter the process.
+  // TODO(shrikant): In general there seem to be issues with how AttemptExit
+  // reentry works. In future release please clean up related code.
+  if (!browser_shutdown::IsTryingToQuit()) {
+    CloseOpenAshBrowsers();
+    chrome::CloseAsh();
+  }
   // Tell the rest of Chrome about it.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_ASH_SESSION_ENDED,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
 
   // This will delete the MetroViewerProcessHost object. Don't access member
   // variables/functions after this call.
   g_browser_process->platform_part()->OnMetroViewerProcessTerminated();
 }
@@ skipping 33 matching lines @@
   OpenURL(GURL(url));
 }
 
 void ChromeMetroViewerProcessHost::OnHandleSearchRequest(
     const string16& search_string) {
   GURL url(GetDefaultSearchURLForSearchTerms(
       ProfileManager::GetDefaultProfileOrOffTheRecord(), search_string));
   if (url.is_valid())
     OpenURL(url);
 }