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

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

Issue 10106011: Fixes FindBar crash. The crash appears to be because if you select a (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 | « chrome/browser/oom_priority_manager_browsertest.cc ('k') | 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 2d15f70ac8160b0a4e6ee3283035abc9edc70123..706126662d1df38b8c53fe5db6a6b18c44169df8 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -3538,6 +3538,7 @@ void Browser::ActiveTabChanged(TabContentsWrapper* old_contents,
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) {
const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
@@ -3545,17 +3546,16 @@ void Browser::ActiveTabChanged(TabContentsWrapper* old_contents,
// Log to track down crash crbug.com/119068
LOG(WARNING) << "Reloading killed tab at " << index;
Reload(CURRENT_TAB);
- return;
+ did_reload = true;
}
}
// Discarded tabs always get reloaded.
- if (IsTabDiscarded(index)) {
+ if (!did_reload && IsTabDiscarded(index)) {
// Log to track down crash crbug.com/119068
LOG(WARNING) << "Reloading discarded tab at " << index
<< " gesture " << user_gesture;
Reload(CURRENT_TAB);
- return;
}
// If we have any update pending, do it now.
« no previous file with comments | « chrome/browser/oom_priority_manager_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698