Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / existing_user_controller.h

diff --git a/src/chrome/browser/chromeos/login/existing_user_controller.h b/src/chrome/browser/chromeos/login/existing_user_controller.h
index ace3e05..b854603 100644 (file)
--- a/src/chrome/browser/chromeos/login/existing_user_controller.h
+++ b/src/chrome/browser/chromeos/login/existing_user_controller.h
@@ -78,19 +78,19 @@ class ExistingUserController : public LoginDisplay::Delegate,
   virtual void CancelPasswordChangedFlow() OVERRIDE;
   virtual void CreateAccount() OVERRIDE;
   virtual void CompleteLogin(const UserContext& user_context) OVERRIDE;
-  virtual string16 GetConnectedNetworkName() OVERRIDE;
+  virtual base::string16 GetConnectedNetworkName() OVERRIDE;
   virtual bool IsSigninInProgress() const OVERRIDE;
   virtual void Login(const UserContext& user_context) OVERRIDE;
   virtual void MigrateUserData(const std::string& old_password) OVERRIDE;
   virtual void LoginAsRetailModeUser() OVERRIDE;
   virtual void LoginAsGuest() OVERRIDE;
   virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE;
-  virtual void LoginAsKioskApp(const std::string& app_id) OVERRIDE;
+  virtual void LoginAsKioskApp(const std::string& app_id,
+                               bool diagnostic_mode) OVERRIDE;
   virtual void OnSigninScreenReady() OVERRIDE;
   virtual void OnUserSelected(const std::string& username) OVERRIDE;
   virtual void OnStartEnterpriseEnrollment() OVERRIDE;
   virtual void OnStartKioskEnableScreen() OVERRIDE;
-  virtual void OnStartDeviceReset() OVERRIDE;
   virtual void OnStartKioskAutolaunchScreen() OVERRIDE;
   virtual void ResetPublicSessionAutoLoginTimer() OVERRIDE;
   virtual void ResyncUserData() OVERRIDE;
@@ -172,8 +172,8 @@ class ExistingUserController : public LoginDisplay::Delegate,
 
   // Handles result of consumer kiosk configurability check and starts
   // enable kiosk screen if applicable.
-  void OnConsumerKioskModeCheckCompleted(
-      KioskAppManager::ConsumerKioskModeStatus status);
+  void OnConsumerKioskAutoLaunchCheckCompleted(
+      KioskAppManager::ConsumerKioskAutoLaunchStatus status);
 
   // Enters the enterprise enrollment screen. |forced| is true if this is the
   // result of an auto-enrollment check, and the user shouldn't be able to
@@ -212,6 +212,9 @@ class ExistingUserController : public LoginDisplay::Delegate,
   // Updates the |login_display_| attached to this controller.
   void UpdateLoginDisplay(const UserList& users);
 
+  // Sends an accessibility alert event to extension listeners.
+  void SendAccessibilityAlert(const std::string& alert_text);
+
   // Public session auto-login timer.
   scoped_ptr<base::OneShotTimer<ExistingUserController> > auto_login_timer_;