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/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/common/wm/shelf/wm_shelf_util.h" |
8 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
9 #include "ash/session/session_state_delegate.h" | 10 #include "ash/session/session_state_delegate.h" |
10 #include "ash/shelf/shelf_layout_manager.h" | 11 #include "ash/shelf/shelf_layout_manager.h" |
11 #include "ash/shelf/shelf_util.h" | 12 #include "ash/shelf/shelf_util.h" |
12 #include "ash/shell_delegate.h" | 13 #include "ash/shell_delegate.h" |
13 #include "ash/system/tray/system_tray.h" | 14 #include "ash/system/tray/system_tray.h" |
14 #include "ash/system/tray/system_tray_delegate.h" | 15 #include "ash/system/tray/system_tray_delegate.h" |
15 #include "ash/system/tray/system_tray_notifier.h" | 16 #include "ash/system/tray/system_tray_notifier.h" |
16 #include "ash/system/tray/tray_constants.h" | 17 #include "ash/system/tray/tray_constants.h" |
17 #include "ash/system/tray/tray_item_view.h" | 18 #include "ash/system/tray/tray_item_view.h" |
18 #include "ash/system/tray/tray_utils.h" | 19 #include "ash/system/tray/tray_utils.h" |
19 #include "ash/system/user/rounded_image_view.h" | 20 #include "ash/system/user/rounded_image_view.h" |
20 #include "ash/system/user/user_view.h" | 21 #include "ash/system/user/user_view.h" |
21 #include "ash/wm/common/shelf/wm_shelf_util.h" | |
22 #include "base/logging.h" | 22 #include "base/logging.h" |
23 #include "base/strings/string16.h" | 23 #include "base/strings/string16.h" |
24 #include "components/signin/core/account_id/account_id.h" | 24 #include "components/signin/core/account_id/account_id.h" |
25 #include "components/user_manager/user_info.h" | 25 #include "components/user_manager/user_info.h" |
26 #include "grit/ash_strings.h" | 26 #include "grit/ash_strings.h" |
27 #include "ui/aura/window.h" | 27 #include "ui/aura/window.h" |
28 #include "ui/base/l10n/l10n_util.h" | 28 #include "ui/base/l10n/l10n_util.h" |
29 #include "ui/gfx/image/image.h" | 29 #include "ui/gfx/image/image.h" |
30 #include "ui/views/border.h" | 30 #include "ui/views/border.h" |
31 #include "ui/views/controls/label.h" | 31 #include "ui/views/controls/label.h" |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 // Unit tests might come here with no images for some users. | 270 // Unit tests might come here with no images for some users. |
271 if (avatar_->size().IsEmpty()) | 271 if (avatar_->size().IsEmpty()) |
272 avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); | 272 avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); |
273 } | 273 } |
274 | 274 |
275 void TrayUser::UpdateLayoutOfItem() { | 275 void TrayUser::UpdateLayoutOfItem() { |
276 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment()); | 276 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment()); |
277 } | 277 } |
278 | 278 |
279 } // namespace ash | 279 } // namespace ash |
OLD | NEW |