diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 23:08:24 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 23:08:24 +0000 |
| commit | aa6bb5ac82fa25a709a0c0ff26b2ea2048d6a108 (patch) | |
| tree | 8921463c55d0f14b4c927ca43f578d34b96c8499 | |
| parent | eff90b50fccb243ce36f940b77b4d2b69abc40a2 (diff) | |
| download | chromium_src-aa6bb5ac82fa25a709a0c0ff26b2ea2048d6a108.zip chromium_src-aa6bb5ac82fa25a709a0c0ff26b2ea2048d6a108.tar.gz chromium_src-aa6bb5ac82fa25a709a0c0ff26b2ea2048d6a108.tar.bz2 | |
Fix edge-case crash in TrayBubbleBorder::UpdateArrowOffset()
BUG=179227
ui/views/bubble OWNER (DCHECK only):
TBR=msw@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12390028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186018 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/system/tray/system_tray.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index 6ee1fa4..feb1fb3 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -78,6 +78,7 @@ class SystemBubbleWrapper { void InitView(TrayBackgroundView* tray, views::View* anchor, TrayBubbleView::InitParams* init_params) { + DCHECK(anchor); user::LoginStatus login_status = Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus(); bubble_->InitView(anchor, login_status, init_params); @@ -408,7 +409,7 @@ void SystemTray::UpdateNotificationBubble() { this, notification_items_, SystemTrayBubble::BUBBLE_TYPE_NOTIFICATION); views::View* anchor; TrayBubbleView::AnchorType anchor_type; - if (system_bubble_.get()) { + if (system_bubble_.get() && system_bubble_->bubble_view()) { anchor = system_bubble_->bubble_view(); anchor_type = TrayBubbleView::ANCHOR_TYPE_BUBBLE; } else { |