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/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/session/session_state_delegate.h" | 10 #include "ash/session/session_state_delegate.h" |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 user_name = new views::Label(user_name_string); | 389 user_name = new views::Label(user_name_string); |
390 user_name->SetHorizontalAlignment(gfx::ALIGN_LEFT); | 390 user_name->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
391 } | 391 } |
392 } | 392 } |
393 | 393 |
394 views::Label* user_email = NULL; | 394 views::Label* user_email = NULL; |
395 if (login_status != user::LOGGED_IN_GUEST && | 395 if (login_status != user::LOGGED_IN_GUEST && |
396 (multiprofile_index || !IsMultiAccountSupportedAndUserActive())) { | 396 (multiprofile_index || !IsMultiAccountSupportedAndUserActive())) { |
397 base::string16 user_email_string = | 397 base::string16 user_email_string = |
398 login_status == user::LOGGED_IN_SUPERVISED | 398 login_status == user::LOGGED_IN_SUPERVISED |
399 ? l10n_util::GetStringUTF16( | 399 ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL) |
400 IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL) | |
401 : base::UTF8ToUTF16( | 400 : base::UTF8ToUTF16( |
402 delegate->GetUserInfo(multiprofile_index)->GetEmail()); | 401 delegate->GetUserInfo(multiprofile_index)->GetEmail()); |
403 if (!user_email_string.empty()) { | 402 if (!user_email_string.empty()) { |
404 user_email = new views::Label(user_email_string); | 403 user_email = new views::Label(user_email_string); |
405 user_email->SetFontList( | 404 user_email->SetFontList( |
406 ui::ResourceBundle::GetSharedInstance().GetFontList( | 405 ui::ResourceBundle::GetSharedInstance().GetFontList( |
407 ui::ResourceBundle::SmallFont)); | 406 ui::ResourceBundle::SmallFont)); |
408 user_email->SetHorizontalAlignment(gfx::ALIGN_LEFT); | 407 user_email->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
409 } | 408 } |
410 } | 409 } |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
468 content::BrowserContext* context = | 467 content::BrowserContext* context = |
469 delegate->GetBrowserContextByIndex(multiprofile_index); | 468 delegate->GetBrowserContextByIndex(multiprofile_index); |
470 icon->SetImage(delegate->GetUserInfo(context)->GetImage(), | 469 icon->SetImage(delegate->GetUserInfo(context)->GetImage(), |
471 gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); | 470 gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); |
472 } | 471 } |
473 return icon; | 472 return icon; |
474 } | 473 } |
475 | 474 |
476 } // namespace tray | 475 } // namespace tray |
477 } // namespace ash | 476 } // namespace ash |
OLD | NEW |