| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/system/user/tray_user.h" | 5 #include "ash/system/user/tray_user.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/system/tray/system_tray_delegate.h" | 8 #include "ash/system/tray/system_tray_delegate.h" |
| 9 #include "ash/system/tray/tray_constants.h" | 9 #include "ash/system/tray/tray_constants.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 } | 371 } |
| 372 | 372 |
| 373 void TrayUser::OnUpdateRecommended() { | 373 void TrayUser::OnUpdateRecommended() { |
| 374 if (user_.get()) | 374 if (user_.get()) |
| 375 user_->RefreshForUpdate(); | 375 user_->RefreshForUpdate(); |
| 376 } | 376 } |
| 377 | 377 |
| 378 void TrayUser::OnUserUpdate() { | 378 void TrayUser::OnUserUpdate() { |
| 379 avatar_->SetImage( | 379 avatar_->SetImage( |
| 380 ash::Shell::GetInstance()->tray_delegate()->GetUserImage()); | 380 ash::Shell::GetInstance()->tray_delegate()->GetUserImage()); |
| 381 avatar_->SetImageSize(gfx::Size(kUserIconSize, kUserIconSize)); |
| 381 } | 382 } |
| 382 | 383 |
| 383 } // namespace internal | 384 } // namespace internal |
| 384 } // namespace ash | 385 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 9837003:
ash: Make sure the avatar is always of the fixed size. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src