| 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/common/session/session_state_delegate.h" | 7 #include "ash/common/session/session_state_delegate.h" |
| 8 #include "ash/common/shelf/wm_shelf_util.h" | |
| 9 #include "ash/common/wm_shell.h" | 8 #include "ash/common/wm_shell.h" |
| 9 #include "ash/shelf/wm_shelf_util.h" |
| 10 #include "ash/strings/grit/ash_strings.h" | 10 #include "ash/strings/grit/ash_strings.h" |
| 11 #include "ash/system/tray/system_tray.h" | 11 #include "ash/system/tray/system_tray.h" |
| 12 #include "ash/system/tray/system_tray_delegate.h" | 12 #include "ash/system/tray/system_tray_delegate.h" |
| 13 #include "ash/system/tray/system_tray_notifier.h" | 13 #include "ash/system/tray/system_tray_notifier.h" |
| 14 #include "ash/system/tray/tray_constants.h" | 14 #include "ash/system/tray/tray_constants.h" |
| 15 #include "ash/system/tray/tray_item_view.h" | 15 #include "ash/system/tray/tray_item_view.h" |
| 16 #include "ash/system/tray/tray_utils.h" | 16 #include "ash/system/tray/tray_utils.h" |
| 17 #include "ash/system/user/rounded_image_view.h" | 17 #include "ash/system/user/rounded_image_view.h" |
| 18 #include "ash/system/user/user_view.h" | 18 #include "ash/system/user/user_view.h" |
| 19 #include "base/logging.h" | 19 #include "base/logging.h" |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 // Unit tests might come here with no images for some users. | 253 // Unit tests might come here with no images for some users. |
| 254 if (avatar_->size().IsEmpty()) | 254 if (avatar_->size().IsEmpty()) |
| 255 avatar_->SetSize(gfx::Size(kTrayItemSize, kTrayItemSize)); | 255 avatar_->SetSize(gfx::Size(kTrayItemSize, kTrayItemSize)); |
| 256 } | 256 } |
| 257 | 257 |
| 258 void TrayUser::UpdateLayoutOfItem() { | 258 void TrayUser::UpdateLayoutOfItem() { |
| 259 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment()); | 259 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment()); |
| 260 } | 260 } |
| 261 | 261 |
| 262 } // namespace ash | 262 } // namespace ash |
| OLD | NEW |