| 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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 if (!user_name_string.empty()) { | 388 if (!user_name_string.empty()) { |
| 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_LOCALLY_MANAGED | 398 login_status == user::LOGGED_IN_SUPERVISED |
| 399 ? l10n_util::GetStringUTF16( | 399 ? l10n_util::GetStringUTF16( |
| 400 IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL) | 400 IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL) |
| 401 : base::UTF8ToUTF16( | 401 : base::UTF8ToUTF16( |
| 402 delegate->GetUserInfo(multiprofile_index)->GetEmail()); | 402 delegate->GetUserInfo(multiprofile_index)->GetEmail()); |
| 403 if (!user_email_string.empty()) { | 403 if (!user_email_string.empty()) { |
| 404 user_email = new views::Label(user_email_string); | 404 user_email = new views::Label(user_email_string); |
| 405 user_email->SetFontList( | 405 user_email->SetFontList( |
| 406 ui::ResourceBundle::GetSharedInstance().GetFontList( | 406 ui::ResourceBundle::GetSharedInstance().GetFontList( |
| 407 ui::ResourceBundle::SmallFont)); | 407 ui::ResourceBundle::SmallFont)); |
| 408 user_email->SetHorizontalAlignment(gfx::ALIGN_LEFT); | 408 user_email->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 468 content::BrowserContext* context = | 468 content::BrowserContext* context = |
| 469 delegate->GetBrowserContextByIndex(multiprofile_index); | 469 delegate->GetBrowserContextByIndex(multiprofile_index); |
| 470 icon->SetImage(delegate->GetUserInfo(context)->GetImage(), | 470 icon->SetImage(delegate->GetUserInfo(context)->GetImage(), |
| 471 gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); | 471 gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); |
| 472 } | 472 } |
| 473 return icon; | 473 return icon; |
| 474 } | 474 } |
| 475 | 475 |
| 476 } // namespace tray | 476 } // namespace tray |
| 477 } // namespace ash | 477 } // namespace ash |
| OLD | NEW |