summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-15 01:53:52 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-15 01:53:52 +0000
commit19dbb9cfa586d7a3c0925a426b72e9f65ebde6c6 (patch)
tree0a60b51b8cd65bcdd08b0a667428dcd793727b4e /ash
parent6f08317552f732cd6a8ecc7aeaf4f0a7f5f5feff (diff)
downloadchromium_src-19dbb9cfa586d7a3c0925a426b72e9f65ebde6c6.zip
chromium_src-19dbb9cfa586d7a3c0925a426b72e9f65ebde6c6.tar.gz
chromium_src-19dbb9cfa586d7a3c0925a426b72e9f65ebde6c6.tar.bz2
Check for NULL result from GetFocusedView.
BUG=242268 Review URL: https://chromiumcodereview.appspot.com/17032010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/accelerators/accelerator_controller.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 6e5cf29..f30ce5d 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -112,6 +112,8 @@ bool HandleAccessibleFocusCycle(bool reverse) {
if (!focus_manager)
return false;
views::View* view = focus_manager->GetFocusedView();
+ if (!view)
+ return false;
if (!strcmp(view->GetClassName(), views::WebView::kViewClassName))
return false;