diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 17:42:46 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 17:42:46 +0000 |
| commit | 898161ef25df81e45718b684653d045885eaf66d (patch) | |
| tree | b8c3739b05ec98b761c76681f68220a50f376c89 /ash | |
| parent | 108d6c8b03728f2052a89779bf47a09620987c61 (diff) | |
| download | chromium_src-898161ef25df81e45718b684653d045885eaf66d.zip chromium_src-898161ef25df81e45718b684653d045885eaf66d.tar.gz chromium_src-898161ef25df81e45718b684653d045885eaf66d.tar.bz2 | |
Guess at fix for 150944.
When |avatar_| is null, I get a crash with a similar stack trace.
BUG=150944
Test=Crash reports stop coming
Review URL: https://chromiumcodereview.appspot.com/10964047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/system/user/tray_user.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc index 9c0f984..7b90d87 100644 --- a/ash/system/user/tray_user.cc +++ b/ash/system/user/tray_user.cc @@ -340,9 +340,12 @@ void TrayUser::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { } void TrayUser::OnUserUpdate() { - avatar_->SetImage( - ash::Shell::GetInstance()->tray_delegate()->GetUserImage(), - gfx::Size(kUserIconSize, kUserIconSize)); + // Check for null to avoid crbug.com/150944. + if (avatar_) { + avatar_->SetImage( + ash::Shell::GetInstance()->tray_delegate()->GetUserImage(), + gfx::Size(kUserIconSize, kUserIconSize)); + } } } // namespace internal |