Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2066)

Unified Diff: chrome/browser/ui/browser.cc

Issue 11342055: Add more conditions to reload when --reload-killed-tab option is used. (Closed) Base URL: http://git.chromium.org/chromium/src.git@new
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index a5a5fddc227c379179104ddf9186a828403384b3..816fd13f4b13468940db69202cf24c59030727d8 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -647,8 +647,13 @@ 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) {
+ base::TerminationStatus crashed_status = contents->GetCrashedStatus();
+ bool crashed = false;
+ if (crashed_status == base::TERMINATION_STATUS_ABNORMAL_TERMINATION ||
sky 2012/10/30 22:33:01 Move this into an anonmyous function that does all
simonhong_ 2012/10/31 20:48:08 Done.
+ crashed_status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED ||
+ crashed_status == base::TERMINATION_STATUS_PROCESS_CRASHED)
+ crashed = true;
+ if (contents && crashed) {
if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kReloadKilledTabs)) {
chrome::Reload(this, CURRENT_TAB);
@@ -1078,8 +1083,14 @@ void Browser::ActiveTabChanged(TabContents* old_contents,
// 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) {
+ base::TerminationStatus crashed_status =
+ new_contents->web_contents()->GetCrashedStatus();
+ bool crashed = false;
+ if (crashed_status == base::TERMINATION_STATUS_ABNORMAL_TERMINATION ||
+ crashed_status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED ||
+ crashed_status == base::TERMINATION_STATUS_PROCESS_CRASHED)
+ crashed = true;
+ if (user_gesture && crashed) {
const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
if (parsed_command_line.HasSwitch(switches::kReloadKilledTabs)) {
LOG(WARNING) << "Reloading killed tab at " << index;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698