Chromium Code Reviews| 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 "chrome/browser/chromeos/login/user.h" | 5 #include "chrome/browser/chromeos/login/user.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | |
|
Nikita (slow)
2012/11/19 13:36:17
nit: You could drop this include, not used.
bshe
2012/11/19 14:41:35
We have a DCHECK in this file. It looks like I nee
| |
| 7 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
| 8 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/browser/chromeos/login/default_user_images.h" | 10 #include "chrome/browser/chromeos/login/default_user_images.h" |
| 10 #include "chrome/browser/chromeos/login/user_manager.h" | 11 #include "chrome/browser/chromeos/login/user_manager.h" |
| 11 #include "grit/theme_resources.h" | 12 #include "grit/theme_resources.h" |
| 12 #include "ui/base/resource/resource_bundle.h" | 13 #include "ui/base/resource/resource_bundle.h" |
| 13 | 14 |
| 14 namespace chromeos { | 15 namespace chromeos { |
| 15 | 16 |
| 16 namespace { | 17 namespace { |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 79 } | 80 } |
| 80 | 81 |
| 81 string16 User::GetDisplayName() const { | 82 string16 User::GetDisplayName() const { |
| 82 // Fallback to the email account name in case display name haven't been set. | 83 // Fallback to the email account name in case display name haven't been set. |
| 83 return display_name_.empty() ? | 84 return display_name_.empty() ? |
| 84 UTF8ToUTF16(GetAccountName(true)) : | 85 UTF8ToUTF16(GetAccountName(true)) : |
| 85 display_name_; | 86 display_name_; |
| 86 } | 87 } |
| 87 | 88 |
| 88 } // namespace chromeos | 89 } // namespace chromeos |
| OLD | NEW |