diff options
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 222fab2..59f6267 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1848,10 +1848,14 @@ void Browser::ShowHtmlDialog(HtmlDialogContentsDelegate* delegate, } void Browser::SetFocusToLocationBar() { - // This is the same as FocusLocationBar above but doesn't record the user - // metrics. This TabContentsDelegate version is called internally, so - // shouldn't get recorded in user commands. - window_->GetLocationBar()->FocusLocation(); + // Two differences between this and FocusLocationBar(): + // (1) This doesn't get recorded in user metrics, since it's called + // internally. + // (2) This checks whether the location bar can be focused, and if not, clears + // the focus. FocusLocationBar() is only reached when the location bar is + // focusable, but this may be reached at other times, e.g. while in + // fullscreen mode, where we need to leave focus in a consistent state. + window_->SetFocusToLocationBar(); } /////////////////////////////////////////////////////////////////////////////// |