diff options
| author | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 15:13:24 +0000 |
|---|---|---|
| committer | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 15:13:24 +0000 |
| commit | a2f5631cb3652a3a0a6adfd10a9a4a78417e11e3 (patch) | |
| tree | dc2a4c35020a5f9c2a05259bd51665b0c8285871 | |
| parent | ac98224f74018292c6586fba6541deae85027ac4 (diff) | |
| download | chromium_src-a2f5631cb3652a3a0a6adfd10a9a4a78417e11e3.zip chromium_src-a2f5631cb3652a3a0a6adfd10a9a4a78417e11e3.tar.gz chromium_src-a2f5631cb3652a3a0a6adfd10a9a4a78417e11e3.tar.bz2 | |
check for NULL focus view
BUG=158808
Review URL: https://chromiumcodereview.appspot.com/11365009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165381 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/test/ui_test_utils_win.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/test/ui_test_utils_win.cc b/chrome/browser/ui/views/test/ui_test_utils_win.cc index cad080b..7100d90 100644 --- a/chrome/browser/ui/views/test/ui_test_utils_win.cc +++ b/chrome/browser/ui/views/test/ui_test_utils_win.cc @@ -60,7 +60,8 @@ bool IsViewFocused(const Browser* browser, ViewID vid) { DCHECK(widget); const views::FocusManager* focus_manager = widget->GetFocusManager(); DCHECK(focus_manager); - return focus_manager->GetFocusedView()->id() == vid; + const views::View* focused_view = focus_manager->GetFocusedView(); + return focused_view && focused_view->id() == vid; } void ClickOnView(const Browser* browser, ViewID vid) { |