diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-21 21:17:13 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-21 21:17:13 +0000 |
| commit | 90e6f9cebecff994e380e1a7a4956362de45bf24 (patch) | |
| tree | 8004c8fad3547d0f0cbd6dd1f59485722c2865e4 | |
| parent | 35fe7ffdc1998c4522bffb03b3513c1ab1272fef (diff) | |
| download | chromium_src-90e6f9cebecff994e380e1a7a4956362de45bf24.zip chromium_src-90e6f9cebecff994e380e1a7a4956362de45bf24.tar.gz chromium_src-90e6f9cebecff994e380e1a7a4956362de45bf24.tar.bz2 | |
Merge 218431 "Adds the NULL check of shelf in tray_background_view"
> Adds the NULL check of shelf in tray_background_view
>
> This may be called during the initialization and in that case
> shelf is NULL.
>
> BUG=275697
> R=stevenjb@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/23332003
TBR=mukai@chromium.org
Review URL: https://codereview.chromium.org/22980028
git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@218834 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/system/tray/tray_background_view.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc index 1352ecd..cbcd957 100644 --- a/ash/system/tray/tray_background_view.cc +++ b/ash/system/tray/tray_background_view.cc @@ -422,8 +422,9 @@ void TrayBackgroundView::UpdateBubbleViewArrow( ash::internal::ShelfLayoutManager* shelf = ShelfLayoutManager::ForLauncher(root_window); bubble_view->SetArrowPaintType( - shelf->IsVisible() ? views::BubbleBorder::PAINT_NORMAL : - views::BubbleBorder::PAINT_TRANSPARENT); + (shelf && shelf->IsVisible()) ? + views::BubbleBorder::PAINT_NORMAL : + views::BubbleBorder::PAINT_TRANSPARENT); } } // namespace internal |