Add more conditions to reload when --reload-killed-tab option is used.

chrome/browser/ui/browser.cc

 // Copyright (c) 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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 228 matching lines @@
   return BrowserWindow::CreateBrowserWindow(browser);
 }
 
 #if defined(OS_CHROMEOS)
 chrome::HostDesktopType kDefaultHostDesktopType = chrome::HOST_DESKTOP_TYPE_ASH;
 #else
 chrome::HostDesktopType kDefaultHostDesktopType =
     chrome::HOST_DESKTOP_TYPE_NATIVE;
 #endif
 
+bool IsTabCrashed(WebContents* contents) {

[sky, 2012/10/31 21:30:15]

Name this ShouldReloadCrashedTab and have it include the check for the switch.

[simonhong_, 2012/10/31 22:06:43]

Done.

+  base::TerminationStatus crashed_status = contents->GetCrashedStatus();
+
+  if (crashed_status == base::TERMINATION_STATUS_ABNORMAL_TERMINATION ||

[sky, 2012/10/31 21:30:15]

Make this a single return statement, eg:

return crashed_status == xx || crashed_status == yyy ...

[simonhong_, 2012/10/31 22:06:43]

Done.

+      crashed_status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED ||
+      crashed_status == base::TERMINATION_STATUS_PROCESS_CRASHED)
+    return true;
+  else
+    return false;
+}
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, CreateParams:
 
 Browser::CreateParams::CreateParams()
     : type(TYPE_TABBED),
       profile(NULL),
       host_desktop_type(kDefaultHostDesktopType),
@@ skipping 381 matching lines @@
       content::Source<Browser>(this),
       content::NotificationService::NoDetails());
 
   chrome::CloseAllTabs(this);
 }
 
 void Browser::OnWindowActivated() {
   // On some platforms we want to automatically reload tabs that are
   // killed when the user selects them.
   WebContents* contents = chrome::GetActiveWebContents(this);
-  if (contents && contents->GetCrashedStatus() ==
-     base::TERMINATION_STATUS_PROCESS_WAS_KILLED) {
+  if (contents) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kReloadKilledTabs)) {
+            switches::kReloadKilledTabs) && IsTabCrashed(contents)) {
       chrome::Reload(this, CURRENT_TAB);
     }
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // In-progress download termination handling:
 
 void Browser::InProgressDownloadResponse(bool cancel_downloads) {
   if (cancel_downloads) {
@@ skipping 407 matching lines @@
   window_->GetLocationBar()->SaveStateToContents(contents->web_contents());
 }
 
 void Browser::ActiveTabChanged(TabContents* old_contents,
                                TabContents* new_contents,
                                int index,
                                bool user_gesture) {
   // On some platforms we want to automatically reload tabs that are
   // killed when the user selects them.
   bool did_reload = false;
-  if (user_gesture && new_contents->web_contents()->GetCrashedStatus() ==
-        base::TERMINATION_STATUS_PROCESS_WAS_KILLED) {
+  if (user_gesture) {
     const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
-    if (parsed_command_line.HasSwitch(switches::kReloadKilledTabs)) {
+    if (parsed_command_line.HasSwitch(switches::kReloadKilledTabs) &&
+        IsTabCrashed(new_contents->web_contents())) {
       LOG(WARNING) << "Reloading killed tab at " << index;
       static int reload_count = 0;
       UMA_HISTOGRAM_CUSTOM_COUNTS(
           "Tabs.SadTab.ReloadCount", ++reload_count, 1, 1000, 50);
       chrome::Reload(this, CURRENT_TAB);
       did_reload = true;
     }
   }
 
   // Discarded tabs always get reloaded.
@@ skipping 1216 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }