Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h |
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h |
index 00804c9542e2c01337f7d9bcee2a88c8fad0b851..2d8ffab2a3e6a299d85a2c9d4b77585b5dc3ea37 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h |
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h |
@@ -312,14 +312,15 @@ class SigninScreenHandler |
const content::NotificationDetails& details) OVERRIDE; |
// ScreenlockBridge::LockHandler implementation: |
- virtual void ShowBannerMessage(const std::string& message) OVERRIDE; |
- virtual void ShowUserPodCustomIcon(const std::string& username, |
- const gfx::Image& icon) OVERRIDE; |
+ virtual void ShowBannerMessage(const base::string16& message) OVERRIDE; |
+ virtual void ShowUserPodCustomIcon( |
+ const std::string& username, |
+ const ScreenlockBridge::UserPodCustomIconOptions& icon) OVERRIDE; |
virtual void HideUserPodCustomIcon(const std::string& username) OVERRIDE; |
virtual void EnableInput() OVERRIDE; |
virtual void SetAuthType(const std::string& username, |
ScreenlockBridge::LockHandler::AuthType auth_type, |
- const std::string& initial_value) OVERRIDE; |
+ const base::string16& initial_value) OVERRIDE; |
virtual ScreenlockBridge::LockHandler::AuthType GetAuthType( |
const std::string& username) const OVERRIDE; |
virtual void Unlock(const std::string& user_email) OVERRIDE; |
@@ -480,7 +481,7 @@ class SigninScreenHandler |
base::Closure kiosk_enable_flow_aborted_callback_for_test_; |
// Non-owning ptr. |
- // TODO (ygorshenin@): remove this dependency. |
+ // TODO(ygorshenin@): remove this dependency. |
GaiaScreenHandler* gaia_screen_handler_; |
// Helper that retrieves the authenticated user's e-mail address. |