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/system/ash_system_tray_delegate.h" | 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/shell_window_ids.h" | 8 #include "ash/shell_window_ids.h" |
9 #include "ash/system/audio/audio_observer.h" | 9 #include "ash/system/audio/audio_observer.h" |
10 #include "ash/system/bluetooth/bluetooth_observer.h" | 10 #include "ash/system/bluetooth/bluetooth_observer.h" |
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 // Overridden from ash::SystemTrayDelegate: | 234 // Overridden from ash::SystemTrayDelegate: |
235 virtual bool GetTrayVisibilityOnStartup() OVERRIDE { | 235 virtual bool GetTrayVisibilityOnStartup() OVERRIDE { |
236 return !chromeos::KioskModeSettings::Get()->IsKioskModeEnabled(); | 236 return !chromeos::KioskModeSettings::Get()->IsKioskModeEnabled(); |
237 } | 237 } |
238 | 238 |
239 virtual const std::string GetUserDisplayName() const OVERRIDE { | 239 virtual const std::string GetUserDisplayName() const OVERRIDE { |
240 return UserManager::Get()->GetLoggedInUser().GetDisplayName(); | 240 return UserManager::Get()->GetLoggedInUser().GetDisplayName(); |
241 } | 241 } |
242 | 242 |
243 virtual const std::string GetUserEmail() const OVERRIDE { | 243 virtual const std::string GetUserEmail() const OVERRIDE { |
244 return UserManager::Get()->GetLoggedInUser().email(); | 244 return UserManager::Get()->GetLoggedInUser().display_email(); |
245 } | 245 } |
246 | 246 |
247 virtual const SkBitmap& GetUserImage() const OVERRIDE { | 247 virtual const SkBitmap& GetUserImage() const OVERRIDE { |
248 return UserManager::Get()->GetLoggedInUser().image(); | 248 return UserManager::Get()->GetLoggedInUser().image(); |
249 } | 249 } |
250 | 250 |
251 virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE { | 251 virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE { |
252 UserManager* manager = UserManager::Get(); | 252 UserManager* manager = UserManager::Get(); |
253 // At new user image screen manager->IsUserLoggedIn() would return true | 253 // At new user image screen manager->IsUserLoggedIn() would return true |
254 // but there's no browser session available yet so use SessionStarted(). | 254 // but there's no browser session available yet so use SessionStarted(). |
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1192 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); | 1192 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); |
1193 }; | 1193 }; |
1194 | 1194 |
1195 } // namespace | 1195 } // namespace |
1196 | 1196 |
1197 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { | 1197 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { |
1198 return new chromeos::SystemTrayDelegate(tray); | 1198 return new chromeos::SystemTrayDelegate(tray); |
1199 } | 1199 } |
1200 | 1200 |
1201 } // namespace chromeos | 1201 } // namespace chromeos |
OLD | NEW |