summaryrefslogtreecommitdiffstats
path: root/chrome/views
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-27 01:59:45 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-27 01:59:45 +0000
commitbab44ba4d991eb71e696cad6afacf21d0bf1b1e8 (patch)
tree30c1d3cc5620a7478c8bb744f3e1e2a2bb5b933f /chrome/views
parent4a8af424ef5110aaab4fcbda42d8280417e91b2f (diff)
downloadchromium_src-bab44ba4d991eb71e696cad6afacf21d0bf1b1e8.zip
chromium_src-bab44ba4d991eb71e696cad6afacf21d0bf1b1e8.tar.gz
chromium_src-bab44ba4d991eb71e696cad6afacf21d0bf1b1e8.tar.bz2
An attempt at fixing a crasher reported from the field.
BUG=5549 R=sky Review URL: http://codereview.chromium.org/27229 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10565 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views')
-rw-r--r--chrome/views/view.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/views/view.cc b/chrome/views/view.cc
index c7bb123..d435ddb 100644
--- a/chrome/views/view.cc
+++ b/chrome/views/view.cc
@@ -1172,7 +1172,10 @@ void View::RestoreFloatingViewFocus() {
restore_focus_view_task_ = NULL;
should_restore_focus_ = false;
- GetFocusManager()->RestoreFocusedView();
+ FocusManager* focus_manager = GetFocusManager();
+ DCHECK(focus_manager);
+ if (focus_manager)
+ focus_manager->RestoreFocusedView();
}
// static