Index: chrome/browser/ui/webui/signin/user_manager_screen_handler.h |
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h |
index afc801a783d34ce2c80499416226acfebf3550df..8339d61fca1ee72a012904d7ae9c1eb2b88e0be4 100644 |
--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h |
+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h |
@@ -38,14 +38,15 @@ class UserManagerScreenHandler : public content::WebUIMessageHandler, |
void GetLocalizedValues(base::DictionaryValue* localized_strings); |
// ScreenlockBridge::LockHandler implementation. |
- virtual void ShowBannerMessage(const std::string& message) OVERRIDE; |
- virtual void ShowUserPodCustomIcon(const std::string& user_email, |
- const gfx::Image& icon) OVERRIDE; |
+ virtual void ShowBannerMessage(const base::string16& message) OVERRIDE; |
+ virtual void ShowUserPodCustomIcon( |
+ const std::string& user_email, |
+ const ScreenlockBridge::UserPodCustomIconOptions& icon_options) OVERRIDE; |
virtual void HideUserPodCustomIcon(const std::string& user_email) OVERRIDE; |
virtual void EnableInput() OVERRIDE; |
virtual void SetAuthType(const std::string& user_email, |
ScreenlockBridge::LockHandler::AuthType auth_type, |
- const std::string& auth_value) OVERRIDE; |
+ const base::string16& auth_value) OVERRIDE; |
virtual ScreenlockBridge::LockHandler::AuthType GetAuthType( |
const std::string& user_email) const OVERRIDE; |
virtual void Unlock(const std::string& user_email) OVERRIDE; |