diff options
author | ericdingle@google.com <ericdingle@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 20:41:29 +0000 |
---|---|---|
committer | ericdingle@google.com <ericdingle@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 20:41:29 +0000 |
commit | f3a696be8b7b99ab44a2c7fb3e5945f1ee45e30d (patch) | |
tree | 64dc656f502eb0e3bab1e71eae25988b08d92dbd /chrome/browser | |
parent | 14396e9b2d58eda3d5734c57a80783e2dc0a705f (diff) | |
download | chromium_src-f3a696be8b7b99ab44a2c7fb3e5945f1ee45e30d.zip chromium_src-f3a696be8b7b99ab44a2c7fb3e5945f1ee45e30d.tar.gz chromium_src-f3a696be8b7b99ab44a2c7fb3e5945f1ee45e30d.tar.bz2 |
Quick fix to browser tests failure for http://codereview.chromium.org/1921003
Bug=none
Test=none
Review URL: http://codereview.chromium.org/2030004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/extensions/extension_popup_api.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_popup_api.cc b/chrome/browser/extensions/extension_popup_api.cc index 836b5b2..7b1ad36 100644 --- a/chrome/browser/extensions/extension_popup_api.cc +++ b/chrome/browser/extensions/extension_popup_api.cc @@ -144,12 +144,14 @@ class ExtensionPopupHost : public ExtensionPopup::Observer, // don't dismiss the pop-up. Note that an ExtensionPopup must have an // ExtensionHost, but an ExtensionHost may or may not have an // ExtensionView view. We check to make sure. - ExtensionView* view = popup_->host()->view(); - if (view) { - views::Widget* popup_root_widget = view->GetWidget(); - if (popup_root_widget && - popup_root_widget->ContainsNativeView(focused_now)) - return; + if (popup_) { + ExtensionView* view = popup_->host()->view(); + if (view) { + views::Widget* popup_root_widget = view->GetWidget(); + if (popup_root_widget && + popup_root_widget->ContainsNativeView(focused_now)) + return; + } } // If the widget or RenderWidgetHostView hosting the extension that |