| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/user_card_view.h" | 5 #include "ash/common/system/user/user_card_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/common/login_status.h" | 10 #include "ash/common/login_status.h" |
| 11 #include "ash/common/session/session_state_delegate.h" | 11 #include "ash/common/session/session_state_delegate.h" |
| 12 #include "ash/common/system/tray/system_tray_delegate.h" | 12 #include "ash/common/system/tray/system_tray_delegate.h" |
| 13 #include "ash/common/system/tray/system_tray_notifier.h" | 13 #include "ash/common/system/tray/system_tray_notifier.h" |
| 14 #include "ash/common/system/tray/tray_constants.h" | 14 #include "ash/common/system/tray/tray_constants.h" |
| 15 #include "ash/common/system/tray/tray_utils.h" | 15 #include "ash/common/system/tray/tray_utils.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 32 #include "ui/gfx/range/range.h" | 32 #include "ui/gfx/range/range.h" |
| 33 #include "ui/gfx/render_text.h" | 33 #include "ui/gfx/render_text.h" |
| 34 #include "ui/gfx/text_elider.h" | 34 #include "ui/gfx/text_elider.h" |
| 35 #include "ui/gfx/text_utils.h" | 35 #include "ui/gfx/text_utils.h" |
| 36 #include "ui/views/border.h" | 36 #include "ui/views/border.h" |
| 37 #include "ui/views/controls/link.h" | 37 #include "ui/views/controls/link.h" |
| 38 #include "ui/views/controls/link_listener.h" | 38 #include "ui/views/controls/link_listener.h" |
| 39 #include "ui/views/layout/box_layout.h" | 39 #include "ui/views/layout/box_layout.h" |
| 40 | 40 |
| 41 #if defined(OS_CHROMEOS) | 41 #if defined(OS_CHROMEOS) |
| 42 #include "ash/ash_view_ids.h" | 42 #include "ash/common/ash_view_ids.h" |
| 43 #include "ash/common/media_delegate.h" | 43 #include "ash/common/media_delegate.h" |
| 44 #include "ash/common/system/chromeos/media_security/media_capture_observer.h" | 44 #include "ash/common/system/chromeos/media_security/media_capture_observer.h" |
| 45 #include "ui/views/controls/image_view.h" | 45 #include "ui/views/controls/image_view.h" |
| 46 #include "ui/views/layout/fill_layout.h" | 46 #include "ui/views/layout/fill_layout.h" |
| 47 #endif | 47 #endif |
| 48 | 48 |
| 49 namespace ash { | 49 namespace ash { |
| 50 namespace tray { | 50 namespace tray { |
| 51 | 51 |
| 52 namespace { | 52 namespace { |
| (...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 } else { | 441 } else { |
| 442 SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate(); | 442 SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate(); |
| 443 icon->SetImage(delegate->GetUserInfo(user_index)->GetImage(), | 443 icon->SetImage(delegate->GetUserInfo(user_index)->GetImage(), |
| 444 gfx::Size(kTrayItemSize, kTrayItemSize)); | 444 gfx::Size(kTrayItemSize, kTrayItemSize)); |
| 445 } | 445 } |
| 446 return icon; | 446 return icon; |
| 447 } | 447 } |
| 448 | 448 |
| 449 } // namespace tray | 449 } // namespace tray |
| 450 } // namespace ash | 450 } // namespace ash |
| OLD | NEW |