summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-29 17:25:30 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-29 17:25:30 +0000
commit9d8a4642dad84e5bc0ca124ed5201a051045a547 (patch)
tree9aac7c292fe34386f4e4720c2066d336bd002429 /chrome/browser/browser.cc
parent72f5652440c39aae6086a824b2505d23c71b731f (diff)
downloadchromium_src-9d8a4642dad84e5bc0ca124ed5201a051045a547.zip
chromium_src-9d8a4642dad84e5bc0ca124ed5201a051045a547.tar.gz
chromium_src-9d8a4642dad84e5bc0ca124ed5201a051045a547.tar.bz2
The focus would be messed-up when reloading a crashed tab, also causing accelerators to be broken.
This CL also makes sure to keep the focus on the location bar when reloading the NTP. BUG=http://crbug.com/14954 TEST=See bug. Review URL: http://codereview.chromium.org/160206 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 3f54397..ab11f37 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -736,7 +736,8 @@ void Browser::Reload() {
}
// As this is caused by a user action, give the focus to the page.
- current_tab->Focus();
+ if (!current_tab->FocusLocationBarByDefault())
+ current_tab->Focus();
current_tab->controller().Reload(true);
}
}